summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-04 08:14:57 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-01-04 08:14:57 +0000
commitccd59df1e915643dc03ed589bb9c2cc3a3a1144b (patch)
treeabc2cb80b83f71f6f105014b633544d0812ec2a9
parent92809dec0e312a0896da772e223db868024f903e (diff)
parentcfc8963c7cdf0c20a8c0876160de9f3b3ce82e02 (diff)
downloaddevelopment-android13-mainline-cellbroadcast-release.tar.gz
Snap for 9453251 from cfc8963c7cdf0c20a8c0876160de9f3b3ce82e02 to mainline-cellbroadcast-releaseaml_cbr_331910000aml_cbr_331810000aml_cbr_331710020aml_cbr_331610010aml_cbr_331510000android13-mainline-cellbroadcast-release
Change-Id: I58ed2ee0765e866d3e77c247b6b23a67353534e7
-rw-r--r--build/Android.bp5
-rw-r--r--sdk/build_tools_source.prop_template2
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