matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix android name

Browse Source 
Signed-off-by: frameflare <yangzenghua@outlook.com>
This commit is contained in:
frameflare 2024-04-05 14:40:46 +08:00
parent 1a0eb73ea0
commit e1829b03b5
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.github/build.sh vendored
View File

@ -358,8 +358,8 @@ if [[ $BSH_HOST_PLATFORM == android ]]; then
meson_configure+=$'\t'--cross-file=android/cross/$BSH_HOST_ARCH.ini meson_configure+=$'\t'--cross-file=android/cross/$BSH_HOST_ARCH.ini
cat << ANDROID_INI > .github/android-ghactions.ini cat << ANDROID_INI > .github/android-ghactions.ini
[constants] [constants]
andriod_ndk_toolchain_bin = '$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin' android_ndk_toolchain_bin = '$ANDROID_NDK_LATEST_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin'
andriod_sdk_build_tools = '$ANDROID_SDK_ROOT/build-tools/32.0.0' android_sdk_build_tools = '$ANDROID_SDK_ROOT/build-tools/32.0.0'
[properties] [properties]
# android_ndk_toolchain_prefix comes from the correct cross-file in ./android/cross # android_ndk_toolchain_prefix comes from the correct cross-file in ./android/cross
@ -370,16 +370,16 @@ java_runtime_jar = '$JAVA_HOME_8_X64/jre/lib/rt.jar'
[binaries] [binaries]
# android_ndk_toolchain_prefix comes from the correct cross-file in ./android/cross # android_ndk_toolchain_prefix comes from the correct cross-file in ./android/cross
c = andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang') c = android_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang')
cpp = andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang++') cpp = android_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang++')
strip = andriod_ndk_toolchain_bin / 'llvm-strip' strip = android_ndk_toolchain_bin / 'llvm-strip'
javac = '$JAVA_HOME_8_X64/bin/javac' javac = '$JAVA_HOME_8_X64/bin/javac'
jar = '$JAVA_HOME_8_X64/bin/jar' jar = '$JAVA_HOME_8_X64/bin/jar'
d8 = andriod_sdk_build_tools / 'd8' d8 = android_sdk_build_tools / 'd8'
aapt = andriod_sdk_build_tools / 'aapt' aapt = android_sdk_build_tools / 'aapt'
aapt2 = andriod_sdk_build_tools / 'aapt2' aapt2 = android_sdk_build_tools / 'aapt2'
zipalign = andriod_sdk_build_tools / 'zipalign' zipalign = android_sdk_build_tools / 'zipalign'
apksigner = andriod_sdk_build_tools / 'apksigner' apksigner = android_sdk_build_tools / 'apksigner'
ANDROID_INI ANDROID_INI
meson_configure+=$'\t'--cross-file=.github/android-ghactions.ini meson_configure+=$'\t'--cross-file=.github/android-ghactions.ini
fi fi

12
cross-examples/android.ini
View File

@ -1,5 +1,5 @@
[constants] [constants]
andriod_ndk_toolchain_bin = '/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin' android_ndk_toolchain_bin = '/opt/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin'
[properties] [properties]
# only needed if you want to run the custom target powder_apk (powder.apk) # only needed if you want to run the custom target powder_apk (powder.apk)
@ -10,11 +10,11 @@ android_platform_jar = '/opt/android-sdk/platforms/' + android_platform + '/andr
java_runtime_jar = '/usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar' java_runtime_jar = '/usr/lib/jvm/java-8-openjdk/jre/lib/rt.jar'
[binaries] [binaries]
c = andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang') c = android_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang')
# c = [ 'ccache', andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang') ] # c = [ 'ccache', android_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang') ]
cpp = andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang++') cpp = android_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang++')
# cpp = [ 'ccache', andriod_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang++') ] # cpp = [ 'ccache', android_ndk_toolchain_bin / (android_ndk_toolchain_prefix + 'clang++') ]
strip = andriod_ndk_toolchain_bin / 'llvm-strip' strip = android_ndk_toolchain_bin / 'llvm-strip'
# only needed if you want to run the custom target powder_apk (powder.apk) # only needed if you want to run the custom target powder_apk (powder.apk)
javac = '/usr/lib/jvm/java-8-openjdk/bin/javac' javac = '/usr/lib/jvm/java-8-openjdk/bin/javac'
jar = '/usr/lib/jvm/java-8-openjdk/bin/jar' jar = '/usr/lib/jvm/java-8-openjdk/bin/jar'