diff options
| -rw-r--r-- | build/Android.bp | 5 | ||||
| -rw-r--r-- | sdk/build_tools_source.prop_template | 2 |
2 files changed, 5 insertions, 2 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, diff --git a/sdk/build_tools_source.prop_template b/sdk/build_tools_source.prop_template index 6da346cba..d2dad004b 100644 --- a/sdk/build_tools_source.prop_template +++ b/sdk/build_tools_source.prop_template @@ -1,3 +1,3 @@ Pkg.UserSrc=false -Pkg.Revision=${PLATFORM_SDK_VERSION}.0.1 +Pkg.Revision=${PLATFORM_SDK_VERSION}.0.2 #Pkg.Revision=33.0.0 rc4 |