StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Generate NDK stubs for riscv64 too."

Browse Source
This commit is contained in:
Elliott Hughes
2023-03-20 21:10:53 +00:00
committed by Gerrit Code Review
parent 071c76e223 f7d3109972
commit 65a97364ba
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/arch.go
View File

@@ -1694,6 +1694,7 @@ func getNdkAbisConfig() []archConfig {
return []archConfig{ return []archConfig{
{"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}}, {"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}},
{"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}}, {"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}},
{"riscv64", "", "", []string{"riscv64"}},
{"x86_64", "", "", []string{"x86_64"}}, {"x86_64", "", "", []string{"x86_64"}},
{"x86", "", "", []string{"x86"}}, {"x86", "", "", []string{"x86"}},
} }

5
scripts/build-ndk-prebuilts.sh
View File

@@ -19,7 +19,10 @@ if [ -z "${OUT_DIR}" ]; then
exit 1 exit 1
fi fi
TARGET_PRODUCT=ndk build/soong/soong_ui.bash --make-mode --soong-only ${OUT_DIR}/soong/ndk.timestamp # TODO: remove this when all the riscv64 dependencies exist (currently blocked by
# http://b/273792258).
ALLOW_MISSING_DEPENDENCIES=true \
TARGET_PRODUCT=ndk build/soong/soong_ui.bash --make-mode --soong-only ${OUT_DIR}/soong/ndk.timestamp
if [ -n "${DIST_DIR}" ]; then if [ -n "${DIST_DIR}" ]; then
mkdir -p ${DIST_DIR} || true mkdir -p ${DIST_DIR} || true