From f7d3109972de526d5ce50ad25e23912b5e65a713 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 14 Mar 2023 23:11:57 +0000 Subject: [PATCH] Generate NDK stubs for riscv64 too. These will only be provisional, but there are enough different groups that want *something* to make a start on porting that it's probably time... Ignore missing dependencies in build-ndk-prebuilts.sh for now, because various pieces (that the NDK doesn't care about) are still missing. Bug: http://b/273792258 Test: build/soong/scripts/build-ndk-prebuilts.sh Change-Id: I39202a953a73dc449a10a887d497d09079c43402 --- android/arch.go | 1 + scripts/build-ndk-prebuilts.sh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/arch.go b/android/arch.go index 6acf9cf51..4b4691b3d 100644 --- a/android/arch.go +++ b/android/arch.go @@ -1694,6 +1694,7 @@ func getNdkAbisConfig() []archConfig { return []archConfig{ {"arm64", "armv8-a-branchprot", "", []string{"arm64-v8a"}}, {"arm", "armv7-a-neon", "", []string{"armeabi-v7a"}}, + {"riscv64", "", "", []string{"riscv64"}}, {"x86_64", "", "", []string{"x86_64"}}, {"x86", "", "", []string{"x86"}}, } diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh index b57963b34..964a8662c 100755 --- a/scripts/build-ndk-prebuilts.sh +++ b/scripts/build-ndk-prebuilts.sh @@ -19,7 +19,10 @@ if [ -z "${OUT_DIR}" ]; then exit 1 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 mkdir -p ${DIST_DIR} || true