From 46e8f0779f79120f26345fe04470c8f9292af2bc Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 18 Sep 2021 14:50:11 -0700
Subject: [PATCH] Move denylist code into zygisk

---
 native/jni/Android.mk                   | 8 ++++----
 native/jni/{ => zygisk}/deny/cli.cpp    | 0
 native/jni/{ => zygisk}/deny/deny.hpp   | 0
 native/jni/{ => zygisk}/deny/revert.cpp | 0
 native/jni/{ => zygisk}/deny/utils.cpp  | 0
 native/jni/zygisk/entry.cpp             | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename native/jni/{ => zygisk}/deny/cli.cpp (100%)
 rename native/jni/{ => zygisk}/deny/deny.hpp (100%)
 rename native/jni/{ => zygisk}/deny/revert.cpp (100%)
 rename native/jni/{ => zygisk}/deny/utils.cpp (100%)

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 435586153..0446a1589 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -22,9 +22,6 @@ LOCAL_SRC_FILES := \
     core/module.cpp \
     core/logging.cpp \
     core/thread.cpp \
-    deny/cli.cpp \
-    deny/utils.cpp \
-    deny/revert.cpp \
     resetprop/persist_properties.cpp \
     resetprop/resetprop.cpp \
     su/su.cpp \
@@ -34,7 +31,10 @@ LOCAL_SRC_FILES := \
     zygisk/entry.cpp \
     zygisk/utils.cpp \
     zygisk/hook.cpp \
-    zygisk/memory.cpp
+    zygisk/memory.cpp \
+    zygisk/deny/cli.cpp \
+    zygisk/deny/utils.cpp \
+    zygisk/deny/revert.cpp
 
 LOCAL_LDLIBS := -llog
 
diff --git a/native/jni/deny/cli.cpp b/native/jni/zygisk/deny/cli.cpp
similarity index 100%
rename from native/jni/deny/cli.cpp
rename to native/jni/zygisk/deny/cli.cpp
diff --git a/native/jni/deny/deny.hpp b/native/jni/zygisk/deny/deny.hpp
similarity index 100%
rename from native/jni/deny/deny.hpp
rename to native/jni/zygisk/deny/deny.hpp
diff --git a/native/jni/deny/revert.cpp b/native/jni/zygisk/deny/revert.cpp
similarity index 100%
rename from native/jni/deny/revert.cpp
rename to native/jni/zygisk/deny/revert.cpp
diff --git a/native/jni/deny/utils.cpp b/native/jni/zygisk/deny/utils.cpp
similarity index 100%
rename from native/jni/deny/utils.cpp
rename to native/jni/zygisk/deny/utils.cpp
diff --git a/native/jni/zygisk/entry.cpp b/native/jni/zygisk/entry.cpp
index b8da4b3fb..16c6f0dee 100644
--- a/native/jni/zygisk/entry.cpp
+++ b/native/jni/zygisk/entry.cpp
@@ -11,7 +11,7 @@
 #include <db.hpp>
 
 #include "inject.hpp"
-#include "../deny/deny.hpp"
+#include "deny/deny.hpp"
 
 using namespace std;