Adjust for Nougat

conncui · Sep 30, 2017 · e665342 · e665342
1 parent b3ba245
commit e665342
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/ART.mk b/ART.mk
@@ -27,6 +27,10 @@ LOCAL_C_INCLUDES += \
   art/runtime \
   external/gtest/include
 
+ifeq (1,$(strip $(shell expr $(PLATFORM_SDK_VERSION) \>= 24)))
+  LOCAL_C_INCLUDES += bionic/libc/private
+endif
+
 LOCAL_SHARED_LIBRARIES += \
   libart \
   liblog \

diff --git a/Android.mk b/Android.mk
@@ -42,6 +42,10 @@ ifeq (1,$(strip $(shell expr $(PLATFORM_SDK_VERSION) \>= 22)))
   LOCAL_LDFLAGS := -Wl,--version-script,art/sigchainlib/version-script.txt -Wl,--export-dynamic
 endif
 
+ifeq (1,$(strip $(shell expr $(PLATFORM_SDK_VERSION) \>= 23)))
+  LOCAL_SHARED_LIBRARIES += libwilhelm
+endif
+
 LOCAL_MODULE := xposed
 LOCAL_MODULE_TAGS := optional
 LOCAL_STRIP_MODULE := keep_symbols

diff --git a/libxposed_art.cpp b/libxposed_art.cpp
@@ -56,6 +56,7 @@ bool onVmCreated(JNIEnv*) {
 ////////////////////////////////////////////////////////////
 void logExceptionStackTrace() {
     Thread* self = Thread::Current();
+    ScopedObjectAccess soa(self);
 #if PLATFORM_SDK_VERSION >= 23
     XLOG(ERROR) << self->GetException()->Dump();
 #else
@@ -80,6 +81,7 @@ void prepareSubclassReplacement(JNIEnv* env, jclass clazz) {
 void XposedBridge_hookMethodNative(JNIEnv* env, jclass, jobject javaReflectedMethod,
             jobject, jint, jobject javaAdditionalInfo) {
     // Detect usage errors.
+    ScopedObjectAccess soa(env);
     if (javaReflectedMethod == nullptr) {
 #if PLATFORM_SDK_VERSION >= 23
         ThrowIllegalArgumentException("method must not be null");
@@ -90,7 +92,6 @@ void XposedBridge_hookMethodNative(JNIEnv* env, jclass, jobject javaReflectedMet
     }
 
     // Get the ArtMethod of the method to be hooked.
-    ScopedObjectAccess soa(env);
     ArtMethod* artMethod = ArtMethod::FromReflectedMethod(soa, javaReflectedMethod);
 
     // Hook the method
@@ -103,7 +104,7 @@ jobject XposedBridge_invokeOriginalMethodNative(JNIEnv* env, jclass, jobject jav
     if (UNLIKELY(!isResolved)) {
         ArtMethod* artMethod = ArtMethod::FromReflectedMethod(soa, javaMethod);
         if (LIKELY(artMethod->IsXposedHookedMethod())) {
-            javaMethod = artMethod->GetXposedHookInfo()->reflectedMethod;
+            javaMethod = artMethod->GetXposedHookInfo()->reflected_method;
         }
     }
 #if PLATFORM_SDK_VERSION >= 23

diff --git a/xposed.cpp b/xposed.cpp
@@ -16,6 +16,7 @@
 #include <dlfcn.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdlib.h>
 
 #if PLATFORM_SDK_VERSION >= 18
@@ -309,7 +310,7 @@ static bool addPathToEnv(const char* name, const char* path) {
         char newPath[4096];
         int neededLength = snprintf(newPath, sizeof(newPath), "%s:%s", path, oldPath);
         if (neededLength >= (int)sizeof(newPath)) {
-            ALOGE("ERROR: %s would exceed %d characters", name, sizeof(newPath));
+            ALOGE("ERROR: %s would exceed %" PRIuPTR " characters", name, sizeof(newPath));
             return false;
         }
         setenv(name, newPath, 1);