From 2e4778fede4b1c83d3098a7d92abe367b4b4da45 Mon Sep 17 00:00:00 2001 From: bofeng-song Date: Tue, 9 Sep 2025 14:51:28 +0800 Subject: [PATCH] Reapply "Use PROP_ENABLE_COMPRESS_SO to control whether dynamic libraries are compressed in Android build outputs. (#18819)" (#18822) (#18999) --- .../workflows/native-compile-platforms.yml | 10 ++++--- native/cocos/core/scene-graph/Node.cpp | 7 +++++ .../android/jni/JniCocosSurfaceView.cpp | 28 +++++++++---------- .../source/platforms/android.ts | 14 ++++++++-- .../source/platforms/google-play.ts | 15 ++++++++-- templates/android/build/build.gradle | 2 +- templates/android/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/template/app/AndroidManifest.xml | 1 - templates/android/template/app/build.gradle | 8 +++++- templates/android/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../android/template/instantapp/build.gradle | 8 +++++- templates/google-play/build/build.gradle | 2 +- templates/google-play/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../template/app/AndroidManifest.xml | 1 - .../google-play/template/app/build.gradle | 8 +++++- templates/google-play/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../template/instantapp/build.gradle | 8 +++++- templates/xr-huaweivr/build/build.gradle | 2 +- templates/xr-huaweivr/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../template/app/AndroidManifest.xml | 1 - .../xr-huaweivr/template/app/build.gradle | 8 +++++- templates/xr-huaweivr/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../template/instantapp/build.gradle | 8 +++++- templates/xr-meta/build/build.gradle | 2 +- templates/xr-meta/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../xr-meta/template/app/AndroidManifest.xml | 1 - templates/xr-meta/template/app/build.gradle | 8 +++++- templates/xr-meta/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../xr-meta/template/instantapp/build.gradle | 8 +++++- templates/xr-monado/build/build.gradle | 2 +- templates/xr-monado/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../template/app/AndroidManifest.xml | 1 - templates/xr-monado/template/app/build.gradle | 8 +++++- templates/xr-monado/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../template/instantapp/build.gradle | 8 +++++- templates/xr-pico/build/build.gradle | 2 +- templates/xr-pico/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../xr-pico/template/app/AndroidManifest.xml | 1 - templates/xr-pico/template/app/build.gradle | 8 +++++- templates/xr-pico/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../xr-pico/template/instantapp/build.gradle | 8 +++++- templates/xr-rokid/build/build.gradle | 2 +- templates/xr-rokid/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../xr-rokid/template/app/AndroidManifest.xml | 1 - templates/xr-rokid/template/app/build.gradle | 8 +++++- templates/xr-rokid/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../xr-rokid/template/instantapp/build.gradle | 8 +++++- templates/xr-spaces/build/build.gradle | 2 +- templates/xr-spaces/build/gradle.properties | 10 ++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../template/app/AndroidManifest.xml | 1 - templates/xr-spaces/template/app/build.gradle | 8 +++++- templates/xr-spaces/template/build.gradle | 2 +- .../template/instantapp/AndroidManifest.xml | 1 - .../template/instantapp/build.gradle | 8 +++++- 69 files changed, 235 insertions(+), 111 deletions(-) diff --git a/.github/workflows/native-compile-platforms.yml b/.github/workflows/native-compile-platforms.yml index 12d6daa715..fd8d72569c 100644 --- a/.github/workflows/native-compile-platforms.yml +++ b/.github/workflows/native-compile-platforms.yml @@ -79,7 +79,7 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r21e + ndk-version: r28b add-to-path: false local-cache: true - uses: actions/setup-java@v4 @@ -93,6 +93,7 @@ jobs: run: | NATIVE_ROOT=$GITHUB_WORKSPACE/native ANDROID_NDK=${{ steps.setup-ndk.outputs.ndk-path }} + NDK_VERSION=${{ steps.setup-ndk.outputs.ndk-full-version }} NATIVE_DIR=$GITHUB_WORKSPACE/templates/android-template echo "Compiling Android ... " cd $GITHUB_WORKSPACE/templates/ @@ -119,7 +120,7 @@ jobs: ASSET_DIR=$GITHUB_WORKSPACE/templates/android/build/build-android/ - sed -i "s@^PROP_NDK_PATH.*@PROP_NDK_PATH=$ANDROID_NDK@g" gradle.properties + sed -i "s@^PROP_NDK_VERSION.*@PROP_NDK_VERSION=$NDK_VERSION@g" gradle.properties sed -i "s@^APPLICATION_ID.*@APPLICATION_ID=com.cocos.android@g" gradle.properties sed -i "s@^RES_PATH.*@RES_PATH=$ASSET_DIR@g" gradle.properties sed -i "s@^COCOS_ENGINE_PATH.*@COCOS_ENGINE_PATH=$NATIVE_ROOT@g" gradle.properties @@ -178,7 +179,7 @@ jobs: - uses: nttld/setup-ndk@v1 id: setup-ndk with: - ndk-version: r21e + ndk-version: r28b add-to-path: false local-cache: true - uses: actions/setup-java@v4 @@ -192,6 +193,7 @@ jobs: run: | NATIVE_ROOT=$GITHUB_WORKSPACE/native ANDROID_NDK=${{ steps.setup-ndk.outputs.ndk-path }} + NDK_VERSION=${{ steps.setup-ndk.outputs.ndk-full-version }} NATIVE_DIR=$GITHUB_WORKSPACE/templates/android-template echo "Compiling Android ... " cd $GITHUB_WORKSPACE/templates/ @@ -228,7 +230,7 @@ jobs: ASSET_DIR=$GITHUB_WORKSPACE/templates/android/build/build-android/ - sed -i "s@^PROP_NDK_PATH.*@PROP_NDK_PATH=$ANDROID_NDK@g" gradle.properties + sed -i "s@^PROP_NDK_VERSION.*@PROP_NDK_VERSION=$NDK_VERSION@g" gradle.properties sed -i "s@^APPLICATION_ID.*@APPLICATION_ID=com.cocos.android@g" gradle.properties sed -i "s@^RES_PATH.*@RES_PATH=$ASSET_DIR@g" gradle.properties sed -i "s@^COCOS_ENGINE_PATH.*@COCOS_ENGINE_PATH=$NATIVE_ROOT@g" gradle.properties diff --git a/native/cocos/core/scene-graph/Node.cpp b/native/cocos/core/scene-graph/Node.cpp index aa82d21fc9..83702eb0a4 100644 --- a/native/cocos/core/scene-graph/Node.cpp +++ b/native/cocos/core/scene-graph/Node.cpp @@ -57,7 +57,14 @@ Node::Node(const ccstd::string &name) { _colorDirty = 1; #define NODE_SHARED_MEMORY_BYTE_LENGTH (36) +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Winvalid-offsetof" +#endif static_assert(offsetof(Node, _finalOpacity) + sizeof(_finalOpacity) - offsetof(Node, _eventMask) == NODE_SHARED_MEMORY_BYTE_LENGTH, "Wrong shared memory size"); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif _sharedMemoryActor.initialize(&_eventMask, NODE_SHARED_MEMORY_BYTE_LENGTH); #undef NODE_SHARED_MEMORY_BYTE_LENGTH diff --git a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp index d4508f5742..2de084d088 100644 --- a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp +++ b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp @@ -219,14 +219,14 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionMove(JNI touchEvent.windowId = windowId; touchEvent.type = cc::TouchEvent::Type::MOVED; - int size = env->GetArrayLength(ids); - jint id[size]; - jfloat x[size]; - jfloat y[size]; + const int size = env->GetArrayLength(ids); + std::vector id(size); + std::vector x(size); + std::vector y(size); - env->GetIntArrayRegion(ids, 0, size, id); - env->GetFloatArrayRegion(xs, 0, size, x); - env->GetFloatArrayRegion(ys, 0, size, y); + env->GetIntArrayRegion(ids, 0, size, id.data()); + env->GetFloatArrayRegion(xs, 0, size, x.data()); + env->GetFloatArrayRegion(ys, 0, size, y.data()); for (int i = 0; i < size; i++) { touchEvent.touches.emplace_back(x[i], y[i], id[i]); } @@ -246,14 +246,14 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosTouchHandler_handleActionCancel(J touchEvent.windowId = windowId; touchEvent.type = cc::TouchEvent::Type::CANCELLED; - int size = env->GetArrayLength(ids); - jint id[size]; - jfloat x[size]; - jfloat y[size]; + const int size = env->GetArrayLength(ids); + std::vector id(size); + std::vector x(size); + std::vector y(size); - env->GetIntArrayRegion(ids, 0, size, id); - env->GetFloatArrayRegion(xs, 0, size, x); - env->GetFloatArrayRegion(ys, 0, size, y); + env->GetIntArrayRegion(ids, 0, size, id.data()); + env->GetFloatArrayRegion(xs, 0, size, x.data()); + env->GetFloatArrayRegion(ys, 0, size, y.data()); for (int i = 0; i < size; i++) { touchEvent.touches.emplace_back(x[i], y[i], id[i]); } diff --git a/scripts/native-pack-tool/source/platforms/android.ts b/scripts/native-pack-tool/source/platforms/android.ts index c43dad508b..609a38ccc7 100644 --- a/scripts/native-pack-tool/source/platforms/android.ts +++ b/scripts/native-pack-tool/source/platforms/android.ts @@ -21,6 +21,7 @@ export interface IAndroidParams { javaHome: string; javaPath: string; androidInstant: boolean, + isSoFileCompressed: boolean; maxAspectRatio: string; remoteUrl?: string; apiLevel: number; @@ -363,14 +364,23 @@ export class AndroidPackTool extends NativePackTool { content = content.replace(/COCOS_ENGINE_PATH=.*/, `COCOS_ENGINE_PATH=${cchelper.fixPath(Paths.nativeRoot)}`); content = content.replace(/APPLICATION_ID=.*/, `APPLICATION_ID=${options.packageName}`); content = content.replace(/NATIVE_DIR=.*/, `NATIVE_DIR=${cchelper.fixPath(this.paths.platformTemplateDirInPrj)}`); + content = content.replace(/PROP_ENABLE_COMPRESS_SO=.*/, `PROP_ENABLE_COMPRESS_SO=${options.isSoFileCompressed ? "true" : "false"}`); + const ndkPropertiesPath = cchelper.join(options.ndkPath, 'source.properties'); + if (fs.existsSync(ndkPropertiesPath)) { + const ndkContent = fs.readFileSync(ndkPropertiesPath, 'utf-8'); + const regexp = new RegExp(`Pkg.Revision = (.*)`); + const r = ndkContent.match(regexp); + if (r) { + content = content.replace(/PROP_NDK_VERSION=.*/, `PROP_NDK_VERSION=${r[1]}`); + } + } + if (process.platform === 'win32') { options.ndkPath = options.ndkPath.replace(/\\/g, '\\\\'); } - content = content.replace(/PROP_NDK_PATH=.*/, `PROP_NDK_PATH=${options.ndkPath}`); - const abis = (options.appABIs && options.appABIs.length > 0) ? options.appABIs.join(':') : 'armeabi-v7a'; // todo:新的template里面有个注释也是这个字段,所以要加个g content = content.replace(/PROP_APP_ABI=.*/g, `PROP_APP_ABI=${abis}`); diff --git a/scripts/native-pack-tool/source/platforms/google-play.ts b/scripts/native-pack-tool/source/platforms/google-play.ts index 69953a598a..69e6f3cf72 100644 --- a/scripts/native-pack-tool/source/platforms/google-play.ts +++ b/scripts/native-pack-tool/source/platforms/google-play.ts @@ -51,7 +51,8 @@ export interface IAndroidParams { resizeableActivity: boolean; googleBilling: boolean; playGames: boolean; - customIconInfo: ICustomIconInfo, + customIconInfo: ICustomIconInfo; + isSoFileCompressed: boolean; } const DefaultAPILevel = 27; @@ -406,14 +407,22 @@ export class GooglePlayPackTool extends NativePackTool { content = content.replace(/PROP_ENABLE_GOOGLE_BILLING=.*/, `PROP_ENABLE_GOOGLE_BILLING=${options.googleBilling ? "true" : "false"}`); content = content.replace(/PROP_ENABLE_GOOGLE_PLAY_GAMES=.*/, `PROP_ENABLE_GOOGLE_PLAY_GAMES=${options.playGames ? "true" : "false"}`); + content = content.replace(/PROP_ENABLE_COMPRESS_SO=.*/, `PROP_ENABLE_COMPRESS_SO=${options.isSoFileCompressed ? "true" : "false"}`); + const ndkPropertiesPath = cchelper.join(options.ndkPath, 'source.properties'); + if (fs.existsSync(ndkPropertiesPath)) { + const ndkContent = fs.readFileSync(ndkPropertiesPath, 'utf-8'); + const regexp = new RegExp(`Pkg.Revision = (.*)`); + const r = ndkContent.match(regexp); + if (r) { + content = content.replace(/PROP_NDK_VERSION=.*/, `PROP_NDK_VERSION=${r[1]}`); + } + } if (process.platform === 'win32') { options.ndkPath = options.ndkPath.replace(/\\/g, '\\\\'); } - content = content.replace(/PROP_NDK_PATH=.*/, `PROP_NDK_PATH=${options.ndkPath}`); - const abis = (options.appABIs && options.appABIs.length > 0) ? options.appABIs.join(':') : 'armeabi-v7a'; // todo:新的template里面有个注释也是这个字段,所以要加个g content = content.replace(/PROP_APP_ABI=.*/g, `PROP_APP_ABI=${abis}`); diff --git a/templates/android/build/build.gradle b/templates/android/build/build.gradle index 930c4fa516..899d584e66 100644 --- a/templates/android/build/build.gradle +++ b/templates/android/build/build.gradle @@ -8,7 +8,7 @@ buildscript { // jcenter() // keeped as anchor, will be removed soon } dependencies { - classpath 'com.android.tools.build:gradle:8.0.2' + classpath 'com.android.tools.build:gradle:8.10.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/templates/android/build/gradle.properties b/templates/android/build/gradle.properties index ab7dfb48e1..8d936646c9 100644 --- a/templates/android/build/gradle.properties +++ b/templates/android/build/gradle.properties @@ -24,16 +24,16 @@ android.injected.testOnly=false android.native.buildOutput=verbose # Android SDK version that will be used as the compile project -PROP_COMPILE_SDK_VERSION=34 +PROP_COMPILE_SDK_VERSION=36 # Android SDK version that will be used as the earliest version of android this application can run on PROP_MIN_SDK_VERSION=21 # Android SDK version that will be used as the latest version of android this application has been tested on -PROP_TARGET_SDK_VERSION=34 +PROP_TARGET_SDK_VERSION=36 # Android Build Tools version that will be used as the compile project -PROP_BUILD_TOOLS_VERSION=34.0.0 +PROP_BUILD_TOOLS_VERSION=36.0.0 # Android Application Name PROP_APP_NAME=Cocos Game @@ -44,7 +44,9 @@ PROP_ENABLE_INSTANT_APP=true # InputSDK PROP_ENABLE_INPUTSDK=false -PROP_NDK_PATH= +PROP_NDK_VERSION= + +PROP_ENABLE_COMPRESS_SO=false # Build variant PROP_IS_DEBUG=true diff --git a/templates/android/build/gradle/wrapper/gradle-wrapper.properties b/templates/android/build/gradle/wrapper/gradle-wrapper.properties index 1734c610eb..dd0ebd9c3e 100644 --- a/templates/android/build/gradle/wrapper/gradle-wrapper.properties +++ b/templates/android/build/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Apr 25 14:17:09 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/android/template/app/AndroidManifest.xml b/templates/android/template/app/AndroidManifest.xml index a85bb7ca77..f33e16a603 100644 --- a/templates/android/template/app/AndroidManifest.xml +++ b/templates/android/template/app/AndroidManifest.xml @@ -7,7 +7,6 @@