From cc5dad70f8bec822799c9ccd752a839b3131ac36 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Tue, 6 Jun 2023 23:39:55 +0000 Subject: [PATCH] Apply riscv64 workarounds. These were needed in build-ndk-prebuilts.sh too. Copy them here. Bug: None Test: ./update_ndk_abi.sh Change-Id: Ia6263ff1b0936aa3a80747042662df24ddfb88e0 --- tools/ndk/ndkabidump/__init__.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/ndk/ndkabidump/__init__.py b/tools/ndk/ndkabidump/__init__.py index 8f840fd02..48ec0e83f 100644 --- a/tools/ndk/ndkabidump/__init__.py +++ b/tools/ndk/ndkabidump/__init__.py @@ -39,7 +39,19 @@ class Updater: """Builds the updated NDK ABI dumps.""" soong = Soong(self.src_dir, self.build_dir) logger().info(f"Building ABI dumps to {self.build_dir}") - soong.build(["dump-ndk-abi"], env={"TARGET_PRODUCT": "ndk"}) + soong.build( + ["dump-ndk-abi"], + env={ + "TARGET_PRODUCT": "ndk", + # TODO: remove ALLOW_MISSING_DEPENDENCIES=true when all the + # riscv64 dependencies exist (currently blocked by + # http://b/273792258). + "ALLOW_MISSING_DEPENDENCIES": "true", + # TODO: remove BUILD_BROKEN_DISABLE_BAZEL=1 when bazel supports + # riscv64 (http://b/262192655). + "BUILD_BROKEN_DISABLE_BAZEL": "1", + }, + ) def copy_updated_abi_dumps(self) -> None: """Copies the NDK ABI dumps from the build directory to prebuilts."""