Merge "Apply riscv64 workarounds." am: fc9eaf5daa

Original change: https://android-review.googlesource.com/c/platform/development/+/2618389

Change-Id: I1978e31b867595760d15ea36fa588aae5d965c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-07 01:46:26 +00:00
committed by Automerger Merge Worker

View File

@@ -39,7 +39,19 @@ class Updater:
"""Builds the updated NDK ABI dumps.""" """Builds the updated NDK ABI dumps."""
soong = Soong(self.src_dir, self.build_dir) soong = Soong(self.src_dir, self.build_dir)
logger().info(f"Building ABI dumps to {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: def copy_updated_abi_dumps(self) -> None:
"""Copies the NDK ABI dumps from the build directory to prebuilts.""" """Copies the NDK ABI dumps from the build directory to prebuilts."""