diff --git a/build/Android.bp b/build/Android.bp index 53c958b20..982eabf1f 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,