From 72a73cb2063e5d00c6a0070883c5603c558ed2da Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Tue, 26 Jan 2021 01:58:16 +0800
Subject: [PATCH] Update dobby

---
 edxp-core/src/main/cpp/external/CMakeLists.txt  | 6 +++++-
 edxp-core/src/main/cpp/external/Dobby           | 2 +-
 edxp-core/src/main/cpp/main/src/native_hook.cpp | 2 +-
 sandhook-hooklib/src/main/cpp/includes/inst.h   | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/edxp-core/src/main/cpp/external/CMakeLists.txt b/edxp-core/src/main/cpp/external/CMakeLists.txt
index be39affc..46f56a4a 100644
--- a/edxp-core/src/main/cpp/external/CMakeLists.txt
+++ b/edxp-core/src/main/cpp/external/CMakeLists.txt
@@ -9,6 +9,10 @@ macro(SET_OPTION option value)
 endmacro()
 
 SET_OPTION(DOBBY_GENERATE_SHARED OFF)
+SET_OPTION(Plugin.Android.BionicLinkerRestriction ON)
+if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+    SET_OPTION(DOBBY_DEBUG OFF)
+endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 add_subdirectory(Dobby)
 target_include_directories(dobby PUBLIC Dobby/include)
-target_include_directories(dobby PUBLIC Dobby/builtin-plugin/AndroidRestriction)
\ No newline at end of file
+target_include_directories(dobby PUBLIC Dobby/builtin-plugin/BionicLinkerRestriction)
\ No newline at end of file
diff --git a/edxp-core/src/main/cpp/external/Dobby b/edxp-core/src/main/cpp/external/Dobby
index bb63fbef..782727f2 160000
--- a/edxp-core/src/main/cpp/external/Dobby
+++ b/edxp-core/src/main/cpp/external/Dobby
@@ -1 +1 @@
-Subproject commit bb63fbeff16ee275834f3207a7a687afeed4a2b0
+Subproject commit 782727f269d4776ccfe6b27d1e310c0001c9f6ea
diff --git a/edxp-core/src/main/cpp/main/src/native_hook.cpp b/edxp-core/src/main/cpp/main/src/native_hook.cpp
index b113c8f6..25020127 100644
--- a/edxp-core/src/main/cpp/main/src/native_hook.cpp
+++ b/edxp-core/src/main/cpp/main/src/native_hook.cpp
@@ -7,7 +7,7 @@
 #include <dl_util.h>
 #include <art/runtime/jni_env_ext.h>
 #include <dobby.h>
-#include "android_restriction.h" // from Dobby
+#include "bionic_linker_restriction.h"
 #include "utils.h"
 #include "logging.h"
 #include "native_hook.h"
diff --git a/sandhook-hooklib/src/main/cpp/includes/inst.h b/sandhook-hooklib/src/main/cpp/includes/inst.h
index 0bc3f2a4..70fd4846 100644
--- a/sandhook-hooklib/src/main/cpp/includes/inst.h
+++ b/sandhook-hooklib/src/main/cpp/includes/inst.h
@@ -103,6 +103,8 @@ namespace SandHook {
         virtual bool pcRelated() = 0;
 
         virtual Size bin() = 0;
+
+        virtual ~Inst() = default;
     };
 
     class InstVisitor {