summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2022-12-13 18:22:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-13 18:22:59 +0000
commitf27813c2fd050967fd1148cfaa94ec94814c9108 (patch)
treefe093fc9421ec6a8a26b41711550b818d8a6e831
parent853f9722fe9be52bfd0a41d7bc194d991f0d1c6f (diff)
parente52040b4a0efdf89209e08ab9f96b1086f9e3e0e (diff)
downloaddevelopment-f27813c2fd050967fd1148cfaa94ec94814c9108.tar.gz
Always use prebuilt version of core-lambda-stubs in build-tools am: e52040b4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20579490 Change-Id: I59c67d2abebd6861f58a7fc12d3b996fcde5a719 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--build/Android.bp5
1 files changed, 4 insertions, 1 deletions
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,