From e52040b4a0efdf89209e08ab9f96b1086f9e3e0e Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 25 Nov 2022 17:10:06 +0000 Subject: [PATCH] Always use prebuilt version of core-lambda-stubs in build-tools Bug: 237299698 Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk-repo-build-tools # When ran before this change the resulting zip files contains # a core-lambda-stubs.jar that is built from sources. # When ran after this change the resulting zip files contains # a core-lambda-stubs.jar that is built from prebuilts. Change-Id: I9507eb785bca0fb929dbb587caf0b26455ec9480 --- build/Android.bp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/Android.bp b/build/Android.bp index a97bafb5d..535cd5a02 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -161,7 +161,10 @@ genrule { java_device_for_host { name: "build-tools_core-lambda-stubs-device", visibility: ["//visibility:private"], - libs: ["core-lambda-stubs"], + // Use the prebuilt of the stubs irrespective of whether prebuilts are enabled + // in this build configuration. This ensures that this non-host specific library + // is treated consistently on all hosts. + libs: ["prebuilt_core-lambda-stubs"], target: { windows: { enabled: true,