Merge pull request CodingGay#30 from 18712886438/main

[Bcore] Compatible with case sensitive system
linuxhsj · Jul 5, 2021 · 24a5a78 · 24a5a78
2 parents b61d086 + 844328e
commit 24a5a78
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/Bcore/src/main/cpp/CMakeLists.txt b/Bcore/src/main/cpp/CMakeLists.txt
@@ -16,6 +16,7 @@ add_subdirectory(${DOBBY_SOURCE_DIR} blackdex_d.out)
 # Gradle automatically packages shared libraries with your APK.
 include_directories( dex )
 include_directories( base )
+include_directories( jnihook )
 include_directories( ./ )
 
 aux_source_directory(./ SRC7)

diff --git a/Bcore/src/main/cpp/VmCore.cpp b/Bcore/src/main/cpp/VmCore.cpp
@@ -6,13 +6,13 @@
 #include "utils/Log.h"
 #include "IO.h"
 #include <jni.h>
-#include <jniHook/JniHook.h>
-#include <jniHook/ArtM.h>
+#include <JniHook.h>
+#include <ArtM.h>
 #include <hook/ProcessHook.h>
 #include <hook/VMClassLoaderHook.h>
 #include <hook/UnixFileSystemHook.h>
 #include "DexDump.h"
-#include "Utils/HexDump.h"
+#include "utils/HexDump.h"
 #import "xhook/xhook.h"
 
 struct {

diff --git a/Bcore/src/main/cpp/hook/ProcessHook.cpp b/Bcore/src/main/cpp/hook/ProcessHook.cpp
@@ -4,7 +4,7 @@
 
 #include <sys/types.h>
 #include "ProcessHook.h"
-#import "jniHook/JniHook.h"
+#import <JniHook.h>
 #import "utils/Log.h"
 #import "xhook/xhook.h"
 

diff --git a/Bcore/src/main/cpp/hook/UnixFileSystemHook.cpp b/Bcore/src/main/cpp/hook/UnixFileSystemHook.cpp
@@ -4,7 +4,7 @@
 
 #include <IO.h>
 #include "UnixFileSystemHook.h"
-#import "jniHook/JniHook.h"
+#import <JniHook.h>
 
 /*
  * Class:     java_io_UnixFileSystem

diff --git a/Bcore/src/main/cpp/hook/VMClassLoaderHook.cpp b/Bcore/src/main/cpp/hook/VMClassLoaderHook.cpp
@@ -8,7 +8,8 @@
 
 #include <cstring>
 #include "VMClassLoaderHook.h"
-#import "jniHook/jniHook.h"
+#include <JniHook.h>
+
 static bool hideXposedClass = false;
 
 HOOK_JNI(jobject, findLoadedClass, JNIEnv *env, jobject obj, jobject class_loader, jstring name) {

diff --git a/Bcore/src/main/cpp/jnihook/JniHook.cpp b/Bcore/src/main/cpp/jnihook/JniHook.cpp
@@ -3,10 +3,10 @@
 //
 
 #include <jni.h>
-#include "jniHook.h"
 #include "utils/Log.h"
 #include "Art.h"
 #include "ArtM.h"
+#include "JniHook.h"
 
 static struct {
     int api_level;

diff --git a/Bcore/src/main/cpp/utils/HexDump.cpp b/Bcore/src/main/cpp/utils/HexDump.cpp
@@ -3,9 +3,9 @@
 //
 
 #include <jni.h>
-#include <stdio.h>
+#include <cstdio>
 #include "HexDump.h"
-#include "log.h"
+#include "Log.h"
 
 void HexDump(char *buf, int len, int addr) {
     int i, j, k;

diff --git a/Bcore/src/main/cpp/ziparchive/zip_writer.cc b/Bcore/src/main/cpp/ziparchive/zip_writer.cc
@@ -27,7 +27,7 @@
 
 #include "android-base/logging.h"
 #include "utils/Compat.h"
-#include "android/Log.h"
+//#include "android/Log.h"
 
 #include "entry_name_utils-inl.h"
 #include "zip_archive_common.h"