feat: 更新版本号至 0.1.7，禁用通用 APK 构建，优化 CMake 配置以支持可重现构建

SteveZMTstudios · SteveZMTstudios · commit c82a385eaa11 · 2025-12-29T23:04:48.000+08:00
diff --git a/.github/workflows/android-build-release-matrix.yml b/.github/workflows/android-build-release-matrix.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Init submodules (llama.cpp)
         run: |
-          git submodule update --init --depth 1
+          git submodule update --init
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -101,83 +101,83 @@ jobs:
           path: app/build/outputs/apk/foss/release/*.apk
           retention-days: 1
 
-  build-foss-universal:
-    name: Build FOSS Universal APK
-    runs-on: ubuntu-latest
-    env:
-      JAVA_HOME_21_X64: /usr/lib/jvm/java-21-openjdk-amd64
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Init submodules (llama.cpp)
-        run: |
-          git submodule update --init --depth 1
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-
-      - name: Cache Gradle
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper/
-          key: gradle-cache-${{ runner.os }}-v1
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x ./gradlew
-
-      - name: Accept Android SDK licenses
-        run: |
-          if [ -f "/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager" ]; then
-            SDK_MANAGER="/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager"
-          else
-            SDK_MANAGER=$(find $ANDROID_HOME -name sdkmanager | head -n 1)
-          fi
-          if [ -n "$SDK_MANAGER" ]; then
-            yes | $SDK_MANAGER --licenses || true
-          else
-            yes | sdkmanager --licenses || true
-          fi
-
-      - name: Decode keystore (if provided)
-        shell: bash
-        env:
-          RELEASE_KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
-        run: |
-          set -euo pipefail
-          if [ -n "${RELEASE_KEYSTORE_BASE64:-}" ]; then
-            mkdir -p app/release
-            echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > "$PWD/app/release/release-keystore.jks"
-            chmod 600 "$PWD/app/release/release-keystore.jks"
-          fi
-
-      - name: Build FOSS Universal
-        env:
-          RELEASE_KEYSTORE_KEY: ${{ secrets.RELEASE_KEYSTORE_KEY }}
-          RELEASE_KEYSTORE_SUBKEY: ${{ secrets.RELEASE_KEYSTORE_SUBKEY }}
-        run: |
-          set -euo pipefail
-          export GRADLE_OPTS="-Xmx3g"
+#   build-foss-universal:
+#     name: Build FOSS Universal APK
+#     runs-on: ubuntu-latest
+#     env:
+#       JAVA_HOME_21_X64: /usr/lib/jvm/java-21-openjdk-amd64
+#     steps:
+#       - name: Checkout repository
+#         uses: actions/checkout@v4
+
+#       - name: Init submodules (llama.cpp)
+#         run: |
+#           git submodule update --init --depth 1
+
+#       - name: Set up JDK 21
+#         uses: actions/setup-java@v4
+#         with:
+#           java-version: '21'
+#           distribution: 'temurin'
+
+#       - name: Cache Gradle
+#         uses: actions/cache@v4
+#         with:
+#           path: |
+#             ~/.gradle/caches
+#             ~/.gradle/wrapper/
+#           key: gradle-cache-${{ runner.os }}-v1
+
+#       - name: Grant execute permission for gradlew
+#         run: chmod +x ./gradlew
+
+#       - name: Accept Android SDK licenses
+#         run: |
+#           if [ -f "/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager" ]; then
+#             SDK_MANAGER="/usr/local/lib/android/sdk/cmdline-tools/latest/bin/sdkmanager"
+#           else
+#             SDK_MANAGER=$(find $ANDROID_HOME -name sdkmanager | head -n 1)
+#           fi
+#           if [ -n "$SDK_MANAGER" ]; then
+#             yes | $SDK_MANAGER --licenses || true
+#           else
+#             yes | sdkmanager --licenses || true
+#           fi
+
+#       - name: Decode keystore (if provided)
+#         shell: bash
+#         env:
+#           RELEASE_KEYSTORE_BASE64: ${{ secrets.RELEASE_KEYSTORE_BASE64 }}
+#         run: |
+#           set -euo pipefail
+#           if [ -n "${RELEASE_KEYSTORE_BASE64:-}" ]; then
+#             mkdir -p app/release
+#             echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > "$PWD/app/release/release-keystore.jks"
+#             chmod 600 "$PWD/app/release/release-keystore.jks"
+#           fi
+
+#       - name: Build FOSS Universal
+#         env:
+#           RELEASE_KEYSTORE_KEY: ${{ secrets.RELEASE_KEYSTORE_KEY }}
+#           RELEASE_KEYSTORE_SUBKEY: ${{ secrets.RELEASE_KEYSTORE_SUBKEY }}
+#         run: |
+#           set -euo pipefail
+#           export GRADLE_OPTS="-Xmx3g"
           
-          STORE_FILE="$PWD/app/release/release-keystore.jks"
-          SIGNING_PROPS=""
-          if [ -f "$STORE_FILE" ] && [ -n "${RELEASE_KEYSTORE_KEY:-}" ] && [ -n "${RELEASE_KEYSTORE_SUBKEY:-}" ]; then
-            SIGNING_PROPS="-Pandroid.injected.signing.store.file=$STORE_FILE -Pandroid.injected.signing.store.password=${RELEASE_KEYSTORE_KEY} -Pandroid.injected.signing.key.password=${RELEASE_KEYSTORE_SUBKEY} -Pandroid.injected.signing.key.alias=release"
-          fi
+#           STORE_FILE="$PWD/app/release/release-keystore.jks"
+#           SIGNING_PROPS=""
+#           if [ -f "$STORE_FILE" ] && [ -n "${RELEASE_KEYSTORE_KEY:-}" ] && [ -n "${RELEASE_KEYSTORE_SUBKEY:-}" ]; then
+#             SIGNING_PROPS="-Pandroid.injected.signing.store.file=$STORE_FILE -Pandroid.injected.signing.store.password=${RELEASE_KEYSTORE_KEY} -Pandroid.injected.signing.key.password=${RELEASE_KEYSTORE_SUBKEY} -Pandroid.injected.signing.key.alias=release"
+#           fi
 
-          ./gradlew clean assembleFossRelease $SIGNING_PROPS
+#           ./gradlew clean assembleFossRelease $SIGNING_PROPS
 
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: apk-foss-universal
-          path: app/build/outputs/apk/foss/release/*universal.apk
-          retention-days: 1
+#       - name: Upload Artifact
+#         uses: actions/upload-artifact@v4
+#         with:
+#           name: apk-foss-universal
+#           path: app/build/outputs/apk/foss/release/*universal.apk
+#           retention-days: 1
 
   build-full:
     name: Build Full Flavor APKs
@@ -190,7 +190,7 @@ jobs:
 
       - name: Init submodules (llama.cpp)
         run: |
-          git submodule update --init --depth 1
+          git submodule update --init
 
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -259,7 +259,9 @@ jobs:
 
   release:
     name: Create Release
-    needs: [build-foss-split, build-foss-universal, build-full]
+    # needs: [build-foss-split, build-foss-universal, build-full]
+    needs: [build-foss-split, build-full]
+
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -18,8 +18,8 @@ android {
         applicationId = "top.stevezmt.calsync"
         minSdk = 23
         targetSdk = 36
-        versionCode = 12
-        versionName = "0.1.6"
+        versionCode = 13
+        versionName = "0.1.7"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -64,7 +64,7 @@ android {
                 // Include major architectures and riscv64
                 include("arm64-v8a", "x86_64", "armeabi-v7a", "x86", "riscv64")
             }
-            isUniversalApk = true
+            isUniversalApk = false
         }
     }
 
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -5,18 +5,26 @@ project(calsync_llama_jni C CXX)
 # CMAKE_SOURCE_DIR = app/src/main/cpp
 set(LLAMA_DIR_RELATIVE "${CMAKE_SOURCE_DIR}/../../../../third_party/llama.cpp")
 get_filename_component(LLAMA_DIR ${LLAMA_DIR_RELATIVE} ABSOLUTE)
+get_filename_component(PROJECT_ROOT "${CMAKE_SOURCE_DIR}/../../../.." ABSOLUTE)
 
 # Enforce C++17 for the entire project
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -ffile-prefix-map=${LLAMA_DIR}=. -ffile-prefix-map=${CMAKE_BINARY_DIR}=.")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -ffile-prefix-map=${LLAMA_DIR}=. -ffile-prefix-map=${CMAKE_BINARY_DIR}=.")
 
-# Reproducible build fixes
+# Reproducible build fixes: map all absolute paths to relative
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -ffile-prefix-map=${PROJECT_ROOT}=. -ffile-prefix-map=${LLAMA_DIR}=. -ffile-prefix-map=${CMAKE_BINARY_DIR}=.")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -ffile-prefix-map=${PROJECT_ROOT}=. -ffile-prefix-map=${LLAMA_DIR}=. -ffile-prefix-map=${CMAKE_BINARY_DIR}=.")
+
+add_compile_options("-ffile-prefix-map=${PROJECT_ROOT}=.")
 add_compile_options("-ffile-prefix-map=${LLAMA_DIR}=.")
 add_compile_options("-ffile-prefix-map=${CMAKE_BINARY_DIR}=.")
 add_link_options("LINKER:--build-id=none")
 
+# Force llama.cpp to use fixed build info for reproducibility
+set(GIT_EXECUTABLE "false" CACHE FILEPATH "Disable git for reproducible builds" FORCE)
+set(BUILD_NUMBER "0" CACHE STRING "Fixed build number" FORCE)
+set(BUILD_COMMIT "reproducible" CACHE STRING "Fixed commit hash" FORCE)
+
 if(NOT EXISTS ${LLAMA_DIR})
     message(FATAL_ERROR "llama.cpp not found at ${LLAMA_DIR}")
 endif()

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ android {`
`18`	`18`	`applicationId = "top.stevezmt.calsync"`
`19`	`19`	`minSdk = 23`
`20`	`20`	`targetSdk = 36`
`21`		`- versionCode = 12`
`22`		`- versionName = "0.1.6"`
	`21`	`+ versionCode = 13`
	`22`	`+ versionName = "0.1.7"`
`23`	`23`
`24`	`24`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`25`	`25`
`@@ -64,7 +64,7 @@ android {`
`64`	`64`	`// Include major architectures and riscv64`
`65`	`65`	`include("arm64-v8a", "x86_64", "armeabi-v7a", "x86", "riscv64")`
`66`	`66`	`}`
`67`		`- isUniversalApk = true`
	`67`	`+ isUniversalApk = false`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`