FEAT: add support for Android Q

Author: WaterlooBridge

whale/src/android/android_build.h

@@ -20,6 +20,7 @@
 #define ANDROID_O                       26
 #define ANDROID_O_MR1                   27
 #define ANDROID_P                       28
+#define ANDROID_Q                       29
 
 static inline int32_t GetAndroidApiLevel() {
     char prop_value[PROP_VALUE_MAX];

whale/src/android/art/art_runtime.cc

@@ -54,7 +54,7 @@ bool ArtRuntime::OnLoad(JavaVM *vm, JNIEnv *env, jclass java_class) {
     }
     api_level_ = GetAndroidApiLevel();
     PreLoadRequiredStuff(env);
-    const char *art_path = kLibArtPath;
+    const char *art_path = api_level_ >= ANDROID_Q ? kLibArtPath_Q : kLibArtPath;
     art_elf_image_ = WDynamicLibOpen(art_path);
     if (art_elf_image_ == nullptr) {
         LOG(ERROR) << "Unable to read data from libart.so.";
@@ -70,6 +70,8 @@ bool ArtRuntime::OnLoad(JavaVM *vm, JNIEnv *env, jclass java_class) {
     size_t entrypoint_filed_size = (api_level_ <= ANDROID_LOLLIPOP) ? 8
                                                                     : kPointerSize;
     u4 expected_access_flags = kAccPrivate | kAccStatic | kAccNative;
+    if (api_level_ >= ANDROID_Q)
+            expected_access_flags |= kAccPublicApi;
     jmethodID reserved0 = env->GetStaticMethodID(java_class, kMethodReserved0, "()V");
     jmethodID reserved1 = env->GetStaticMethodID(java_class, kMethodReserved1, "()V");
 
@@ -235,6 +237,9 @@ ArtRuntime::HookMethod(JNIEnv *env, jclass decl_class, jobject hooked_java_metho
     if (api_level_ >= ANDROID_P) {
         access_flags &= ~kAccCriticalNative_P;
     }
+    if (api_level_ >= ANDROID_Q) {
+        access_flags &= ~kAccFastInterpreterToInterpreterInvoke;
+    }
     hooked_method.SetAccessFlags(access_flags);
     hooked_method.SetEntryPointFromQuickCompiledCode(
             class_linker_objects_.quick_generic_jni_trampoline_
@@ -457,6 +462,21 @@ ALWAYS_INLINE bool ArtRuntime::EnforceDisableHiddenAPIPolicyImpl() {
     if (symbol) {
         WInlineHookFunction(symbol, reinterpret_cast<void *>(OnInvokeHiddenAPI), nullptr);
     }
+    // Android Q : Release version
+    symbol = WDynamicLibSymbol(
+            art_elf_image_,
+            "_ZN3art9hiddenapi6detail28ShouldDenyAccessToMemberImplINS_8ArtFieldEEEbPT_NS0_7ApiListENS0_12AccessMethodE"
+    );
+    if (symbol) {
+        WInlineHookFunction(symbol, reinterpret_cast<void *>(OnInvokeHiddenAPI), nullptr);
+    }
+    symbol = WDynamicLibSymbol(
+            art_elf_image_,
+            "_ZN3art9hiddenapi6detail28ShouldDenyAccessToMemberImplINS_9ArtMethodEEEbPT_NS0_7ApiListENS0_12AccessMethodE"
+    );
+    if (symbol) {
+        WInlineHookFunction(symbol, reinterpret_cast<void *>(OnInvokeHiddenAPI), nullptr);
+    }
     return symbol != nullptr;
 }
 

whale/src/android/art/art_runtime.h

@@ -17,11 +17,13 @@
 static constexpr const char *kAndroidLibDir = "/system/lib64/";
 static constexpr const char *kLibNativeBridgePath = "/system/lib64/libnativebridge.so";
 static constexpr const char *kLibArtPath = "/system/lib64/libart.so";
+static constexpr const char *kLibArtPath_Q = "/apex/com.android.runtime/lib64/libart.so";
 static constexpr const char *kLibAocPath = "/system/lib64/libaoc.so";
 static constexpr const char *kLibHoudiniArtPath = "/system/lib64/arm64/libart.so";
 #else
 static constexpr const char *kAndroidLibDir = "/system/lib/";
 static constexpr const char *kLibArtPath = "/system/lib/libart.so";
+static constexpr const char *kLibArtPath_Q = "/apex/com.android.runtime/lib/libart.so";
 static constexpr const char *kLibAocPath = "/system/lib/libaoc.so";
 static constexpr const char *kLibHoudiniArtPath = "/system/lib/arm/libart.so";
 #endif

whale/src/android/art/modifiers.h

@@ -38,6 +38,7 @@ static constexpr uint32_t kAccFastNative = 0x00080000u;   // method (dex only)
 static constexpr uint32_t kAccPreverified = kAccFastNative;  // class (runtime)
 static constexpr uint32_t kAccSkipAccessChecks = kAccPreverified;
 static constexpr uint32_t kAccCriticalNative_P = 0x00200000;  // method (runtime; native only)
+static constexpr uint32_t kAccFastInterpreterToInterpreterInvoke = 0x40000000;
 // Android M only
 static constexpr uint32_t kAccDontInline = 0x00400000u;  // method (dex only)
 // Android N or later. Set by the verifier for a method we do not want the compiler to compile.

whale/src/platform/linux/process_map.cc

@@ -58,7 +58,7 @@ ForeachMemoryRange(std::function<bool(uintptr_t, uintptr_t, char *, char *)> cal
                 break;
             sscanf(buf, "%lx-%lx %s %lx %s %ld %s", &begin, &end, perm,
                    &foo, dev, &inode, mapname);
-            if (!callback(begin, end, perm, mapname)) {
+            if (!callback(begin - foo, end - foo, perm, mapname)) {
                 break;
             }
         }