From 844328eb314d6041bacb0714b20892ef6494af36 Mon Sep 17 00:00:00 2001
From: CallMESuper <zj7859256@gmail.com>
Date: Mon, 5 Jul 2021 18:08:01 +0800
Subject: [PATCH] [Bcore] Compatible with case sensitive system

---
 Bcore/src/main/cpp/CMakeLists.txt              | 1 +
 Bcore/src/main/cpp/VmCore.cpp                  | 6 +++---
 Bcore/src/main/cpp/hook/ProcessHook.cpp        | 2 +-
 Bcore/src/main/cpp/hook/UnixFileSystemHook.cpp | 2 +-
 Bcore/src/main/cpp/hook/VMClassLoaderHook.cpp  | 3 ++-
 Bcore/src/main/cpp/jnihook/JniHook.cpp         | 2 +-
 Bcore/src/main/cpp/utils/HexDump.cpp           | 4 ++--
 Bcore/src/main/cpp/ziparchive/zip_writer.cc    | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Bcore/src/main/cpp/CMakeLists.txt b/Bcore/src/main/cpp/CMakeLists.txt
index cd98616..8a53472 100644
--- 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
index ab41777..9f6027a 100644
--- 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
index e2a01f1..1c0926e 100644
--- 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
index fa5803d..8d5e994 100644
--- 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
index fa85793..a327d6f 100644
--- 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
index f3b46f7..2d55e50 100644
--- 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
index 77cbfb7..aecaf60 100644
--- 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
index 5a76ce3..5d52f30 100644
--- 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"