[pull] master from yujincheng08:master

.github/workflows/android.yml

@@ -20,27 +20,47 @@ jobs:
       - name: Retrieve version
         run: |
           echo VERSION=$(echo ${{ github.event.head_commit.id }} | head -c 10) >> $GITHUB_ENV
-      - uses: actions/cache@v2
+      - name: Cache gradle dep
+        uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
             !~/.gradle/caches/build-cache-*
           key: gradle-deps-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: gradle-deps
-      - uses: actions/cache@v2
+      - name: Install dep
+        run: |
+          sudo apt-get install -y ccache ninja-build
+          ccache -o max_size=1G
+          ccache -o hash_dir=false
+          ccache -o compiler_check='%compiler% -dumpmachine; %compiler% -dumpversion'
+          ccache -zp
+      - name: Cache gradle build
+        uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches/build-cache-*
           key: gradle-builds-${{ github.sha }}
           restore-keys: gradle-builds
+      - name: Cache native build
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.ccache
+          key: native-cache-${{ github.sha }}
+          restore-keys: native-cache-
       - name: Build with Gradle
         run: |
           echo 'org.gradle.caching=true' >> gradle.properties
           echo 'org.gradle.parallel=true' >> gradle.properties
           echo 'org.gradle.vfs.watch=true' >> gradle.properties
           echo 'org.gradle.jvmargs=-Xmx2048m' >> gradle.properties
+          echo 'android.native.buildOutput=verbose' >> gradle.properties
+          ln -s $(which ninja) $(dirname $(which cmake)) # https://issuetracker.google.com/issues/206099937
+          echo "cmake.dir=$(dirname $(dirname $(which cmake)))" >> local.properties
           ./gradlew -PappVerName=${{ env.VERSION }} assembleRelease assembleDebug
+          ccache -s
       - name: Upload built apk
         if: success()
         uses: actions/upload-artifact@v2

app/build.gradle.kts

@@ -3,6 +3,7 @@ import com.android.build.api.artifact.SingleArtifact
 import com.android.build.api.variant.BuiltArtifact
 import com.google.protobuf.gradle.*
 import java.nio.file.Paths
+import org.gradle.internal.os.OperatingSystem
 
 // https://github.com/google/protobuf-gradle-plugin/issues/540#issuecomment-1001053066
 fun com.android.build.api.dsl.AndroidSourceSet.proto(action: SourceDirectorySet.() -> Unit) {
@@ -13,6 +14,15 @@ fun com.android.build.api.dsl.AndroidSourceSet.proto(action: SourceDirectorySet.
         ?.apply(action)
 }
 
+fun findInPath(executable: String): String? {
+    val pathEnv = System.getenv("PATH")
+    return pathEnv.split(File.pathSeparator).map { folder ->
+        Paths.get("${folder}${File.separator}${executable}${if (OperatingSystem.current().isWindows) ".exe" else ""}")
+            .toFile()
+    }.firstOrNull { path ->
+        path.exists()
+    }?.absolutePath
+}
 
 plugins {
     id("com.android.application")
@@ -31,7 +41,7 @@ val appVerName: String by rootProject
 android {
     compileSdk = 32
     buildToolsVersion = "32.0.0"
-    ndkVersion = "23.1.7779620"
+    ndkVersion = "24.0.8215888"
 
     defaultConfig {
         applicationId = "me.iacn.biliroaming"
@@ -43,7 +53,7 @@ android {
         externalNativeBuild {
             cmake {
                 targets("biliroaming")
-                abiFilters("arm64-v8a", "x86")
+                abiFilters("armeabi-v7a", "arm64-v8a", "x86")
                 arguments("-DANDROID_STL=none")
                 val flags = arrayOf(
                     "-Wall",
@@ -66,6 +76,10 @@ android {
                 )
                 cppFlags("-std=c++20", *flags)
                 cFlags("-std=c18", *flags)
+                findInPath("ccache")?.let {
+                    println("Using ccache $it")
+                    arguments += "-DANDROID_CCACHE=$it"
+                }
             }
         }
     }
@@ -102,6 +116,7 @@ android {
             proguardFiles("proguard-rules.pro")
             externalNativeBuild {
                 cmake {
+                    cppFlags += "-flto"
                     val configFlags = arrayOf(
                         "-Oz",
                         "-DNDEBUG"
@@ -232,8 +247,8 @@ dependencies {
     implementation("com.google.protobuf:protobuf-kotlin-lite:3.19.4")
     compileOnly("com.google.protobuf:protoc:3.19.4")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:${rootProject.extra["kotlinVersion"]}")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.1")
     implementation("androidx.documentfile:documentfile:1.0.1")
     implementation("dev.rikka.ndk.thirdparty:cxx:1.2.0")
 }

app/proguard-rules.pro

@@ -8,7 +8,7 @@
   <fields>;
 }
 
--keepclasseswithmembernames class me.iacn.biliroaming.utils.DexHelper {
+-keepclasseswithmembers class me.iacn.biliroaming.utils.DexHelper {
  native <methods>;
  long token;
  java.lang.ClassLoader classLoader;