Announced support for android 10.

iqiyi · Dec 4, 2019 · 9180bd7 · 9180bd7
1 parent a49a3d4
commit 9180bd7
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 121 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,8 @@
 
 ![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
 ![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
-![](https://img.shields.io/badge/release-1.1.12-red.svg?style=flat)
-![](https://img.shields.io/badge/Android-4.0%20--%209.0-blue.svg?style=flat)
+![](https://img.shields.io/badge/release-1.2.0-red.svg?style=flat)
+![](https://img.shields.io/badge/Android-4.0%20--%2010-blue.svg?style=flat)
 ![](https://img.shields.io/badge/arch-armeabi%20%7C%20armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
 [README 中文版](README.zh-CN.md)
@@ -19,7 +19,7 @@ xHook has been keeping optimized for stability and compatibility.
 
 ## Features
 
-* Support Android 4.0 - 9.0 (API level 14 - 28).
+* Support Android 4.0 - 10 (API level 14 - 29).
 * Support armeabi, armeabi-v7a, arm64-v8a, x86 and x86_64.
 * Support **ELF HASH** and **GNU HASH** indexed symbols.
 * Support **SLEB128** encoded relocation info.

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -4,8 +4,8 @@
 
 ![](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat)
 ![](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)
-![](https://img.shields.io/badge/release-1.1.12-red.svg?style=flat)
-![](https://img.shields.io/badge/Android-4.0%20--%209.0-blue.svg?style=flat)
+![](https://img.shields.io/badge/release-1.2.0-red.svg?style=flat)
+![](https://img.shields.io/badge/Android-4.0%20--%2010-blue.svg?style=flat)
 ![](https://img.shields.io/badge/arch-armeabi%20%7C%20armeabi--v7a%20%7C%20arm64--v8a%20%7C%20x86%20%7C%20x86__64-blue.svg?style=flat)
 
 [README English Version](README.md)
@@ -19,7 +19,7 @@ xHook 一直在稳定性和兼容性方面做着持续的优化。
 
 ## 特征
 
-* 支持 Android 4.0 - 9.0（API level 14 - 28）。
+* 支持 Android 4.0 - 10（API level 14 - 29）。
 * 支持 armeabi，armeabi-v7a，arm64-v8a，x86 和 x86_64。
 * 支持 **ELF HASH** 和 **GNU HASH** 索引的符号。
 * 支持 **SLEB128** 编码的重定位信息。

diff --git a/docs/overview/android_plt_hook_overview.zh-CN.md b/docs/overview/android_plt_hook_overview.zh-CN.md
@@ -768,6 +768,13 @@ inline hook 方案强大的同时可能带来以下的问题：
 建议如果 PLT hook 够用的话，就不必尝试 inline hook 了。
 
 
+## 联系作者
+
+
+* [email protected]
+* https://github.com/caikelun
+
+
 ## 许可证
 
 

diff --git a/libxhook/jni/xh_version.c b/libxhook/jni/xh_version.c
@@ -24,8 +24,8 @@
 #include "xh_version.h"
 
 #define XH_VERSION_MAJOR 1
-#define XH_VERSION_MINOR 1
-#define XH_VERSION_EXTRA 12
+#define XH_VERSION_MINOR 2
+#define XH_VERSION_EXTRA 0
 
 #define XH_VERSION ((XH_VERSION_MAJOR << 16) | (XH_VERSION_MINOR <<  8) | (XH_VERSION_EXTRA))
 

diff --git a/xhookwrapper/app/build.gradle b/xhookwrapper/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "com.qiyi.xhookwrapper"
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -27,9 +27,6 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':xhook')
     implementation project(':biz')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
diff --git a/xhookwrapper/app/src/androidTest/java/com/qiyi/xhookwrapper/ExampleInstrumentedTest.java b/xhookwrapper/app/src/androidTest/java/com/qiyi/xhookwrapper/ExampleInstrumentedTest.java
diff --git a/xhookwrapper/app/src/main/java/com/qiyi/xhookwrapper/MainActivity.java b/xhookwrapper/app/src/main/java/com/qiyi/xhookwrapper/MainActivity.java
@@ -1,6 +1,6 @@
 package com.qiyi.xhookwrapper;
 
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.util.Log;
 

diff --git a/xhookwrapper/app/src/main/res/layout/activity_main.xml b/xhookwrapper/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.qiyi.xhookwrapper.MainActivity">
+    android:orientation="vertical"
+    tools:context=".MainActivity">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:text="Hello World!" />
 
-</android.support.constraint.ConstraintLayout>
+</LinearLayout>
diff --git a/xhookwrapper/app/src/test/java/com/qiyi/xhookwrapper/ExampleUnitTest.java b/xhookwrapper/app/src/test/java/com/qiyi/xhookwrapper/ExampleUnitTest.java
diff --git a/xhookwrapper/biz/build.gradle b/xhookwrapper/biz/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -25,8 +25,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
diff --git a/xhookwrapper/biz/src/androidTest/java/com/qiyi/biz/ExampleInstrumentedTest.java b/xhookwrapper/biz/src/androidTest/java/com/qiyi/biz/ExampleInstrumentedTest.java
diff --git a/xhookwrapper/biz/src/test/java/com/qiyi/biz/ExampleUnitTest.java b/xhookwrapper/biz/src/test/java/com/qiyi/biz/ExampleUnitTest.java
diff --git a/xhookwrapper/xhook/build.gradle b/xhookwrapper/xhook/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
-def version = "1.1.11"
+def version = "1.2.0"
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.2'
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 29
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6