Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future
Bug: 347831320
Merged-In: If4a447f77a10ef974ece262282b7e77b1428e194
Change-Id: I572ed297eb03711b12fdaa6f383bb5ba55db81c9
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 6f4bed1..5fc3373 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1010169"
+ build_id: "T1010179"
target: "train_build"
source_file: "mainline-sdks/for-latest-build/current/com.google.android.sdkext/sdk/sdkextensions-sdk-current.zip"
}
diff --git a/current/Android.bp b/current/Android.bp
index 1eb3fc9..2f87000 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -13,11 +13,6 @@
prebuilt_bootclasspath_fragment {
name: "com.android.sdkext-bootclasspath-fragment",
- // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "sdkext_module" is true.
- use_source_config_var: {
- config_namespace: "sdkext_module",
- var_name: "source_build",
- },
visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
apex_available: ["com.android.sdkext"],
licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
@@ -40,11 +35,6 @@
java_sdk_library_import {
name: "framework-sdkextensions",
- // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "sdkext_module" is true.
- use_source_config_var: {
- config_namespace: "sdkext_module",
- var_name: "source_build",
- },
visibility: ["//visibility:public"],
apex_available: [
"com.android.sdkext",
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 9473c12..b55e419 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12091403
\ No newline at end of file
+12161022
\ No newline at end of file
