From c4f4c157bda6da1aae243f02419a22fab751fe39 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Wed, 11 Dec 2019 09:29:59 +0800
Subject: [PATCH] try fix app bundle not extract native libs

---
 app/build.gradle                                       |  7 +++++--
 app/src/main/AndroidManifest.xml                       |  1 +
 gradle.properties                                      |  4 ++++
 .../com/github/kr328/clash/service/ClashService.kt     |  3 +++
 .../com/github/kr328/clash/service/StubSoLoader.kt     | 10 ++++++++++
 5 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 service/src/main/java/com/github/kr328/clash/service/StubSoLoader.kt

diff --git a/app/build.gradle b/app/build.gradle
index 8840242..dd7da1e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.github.kr328.clash"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 10016
-        versionName "1.0.16-alpha"
+        versionCode 10017
+        versionName "1.0.17-alpha"
     }
     buildTypes {
         release {
@@ -29,6 +29,9 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    bundle {
+
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d606f7c..fff4b5c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
+        android:extractNativeLibs="true"
         android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
diff --git a/gradle.properties b/gradle.properties
index 5efc49f..a15bc6d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+
+kapt.incremental.apt=false
+
+android.bundle.enableUncompressedNativeLibraries=false
\ No newline at end of file
diff --git a/service/src/main/java/com/github/kr328/clash/service/ClashService.kt b/service/src/main/java/com/github/kr328/clash/service/ClashService.kt
index 5ab9387..6311286 100644
--- a/service/src/main/java/com/github/kr328/clash/service/ClashService.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/ClashService.kt
@@ -15,6 +15,7 @@ import com.github.kr328.clash.core.utils.Log
 import java.io.File
 import java.io.IOException
 import java.util.concurrent.Executors
+import javax.xml.transform.SourceLocator
 import kotlin.concurrent.thread
 
 class ClashService : Service(), IClashEventObserver, ClashEventService.Master,
@@ -184,6 +185,8 @@ class ClashService : Service(), IClashEventObserver, ClashEventService.Master,
     override fun onCreate() {
         super.onCreate()
 
+        StubSoLoader.loadSo()
+
         clash = Clash(
             this,
             filesDir.resolve("clash"),
diff --git a/service/src/main/java/com/github/kr328/clash/service/StubSoLoader.kt b/service/src/main/java/com/github/kr328/clash/service/StubSoLoader.kt
new file mode 100644
index 0000000..90402f5
--- /dev/null
+++ b/service/src/main/java/com/github/kr328/clash/service/StubSoLoader.kt
@@ -0,0 +1,10 @@
+package com.github.kr328.clash.service
+
+import androidx.annotation.Keep
+
+@Keep
+object StubSoLoader {
+    fun loadSo() {
+        System.loadLibrary("clash")
+    }
+}
\ No newline at end of file