summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-12-28 19:15:58 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-12-28 19:15:58 +0000
commitd5d4707d4ade5324ca42e927c2ab2ec9f443f804 (patch)
treeabc2cb80b83f71f6f105014b633544d0812ec2a9
parent7a900a7628268e48283a76aad35c6c54fc65d6c6 (diff)
parentcfc8963c7cdf0c20a8c0876160de9f3b3ce82e02 (diff)
downloaddevelopment-android13-mainline-permission-release.tar.gz
Snap for 9441970 from cfc8963c7cdf0c20a8c0876160de9f3b3ce82e02 to mainline-permission-releaseaml_per_331913010aml_per_331812030aml_per_331710050aml_per_331611010aml_per_331512020android13-mainline-permission-release
Change-Id: I098247497bfc54323e6d54b3044484cb96167e83
-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