Snap for 8953554 from 65b0e4d3dfefe675571383a2dd1b76cd7f9d029f to mainline-tzdata4-release
Change-Id: Ia0683a264b0e4e928fda1fac78755bd118a8bab1
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index eef42e1..d9d1726 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: "T1004024"
+ build_id: "T1004275"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.uwb/sdk/uwb-module-sdk-current.zip"
}
diff --git a/3/snapshot-creation-build-number.txt b/3/snapshot-creation-build-number.txt
index c25b1f1..46fc4d1 100644
--- a/3/snapshot-creation-build-number.txt
+++ b/3/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8501766
\ No newline at end of file
+8636759
\ No newline at end of file
diff --git a/current/Android.bp b/current/Android.bp
index fe173e4..7c85ed6 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,14 +1,39 @@
// This is auto-generated. DO NOT EDIT.
-// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_java_import",
- "module_java_sdk_library_import",
- "module_prebuilt_bootclasspath_fragment",
- "module_prebuilt_systemserverclasspath_fragment",
- ],
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+ name: "uwb_prebuilt_java_import",
+ module_type: "java_import",
+ config_namespace: "uwb_module",
+ bool_variables: ["source_build"],
+ properties: ["prefer"],
+}
+
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+ name: "uwb_prebuilt_java_sdk_library_import",
+ module_type: "java_sdk_library_import",
+ config_namespace: "uwb_module",
+ bool_variables: ["source_build"],
+ properties: ["prefer"],
+}
+
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+ name: "uwb_prebuilt_prebuilt_bootclasspath_fragment",
+ module_type: "prebuilt_bootclasspath_fragment",
+ config_namespace: "uwb_module",
+ bool_variables: ["source_build"],
+ properties: ["prefer"],
+}
+
+// Soong config variable module type added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type {
+ name: "uwb_prebuilt_prebuilt_systemserverclasspath_fragment",
+ module_type: "prebuilt_systemserverclasspath_fragment",
+ config_namespace: "uwb_module",
+ bool_variables: ["source_build"],
+ properties: ["prefer"],
}
package {
@@ -40,12 +65,12 @@
},
}
-module_prebuilt_bootclasspath_fragment {
+uwb_prebuilt_prebuilt_bootclasspath_fragment {
name: "com.android.uwb-bootclasspath-fragment",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
prefer: true,
soong_config_variables: {
- module_build_from_source: {
+ source_build: {
prefer: false,
},
},
@@ -106,12 +131,12 @@
},
}
-module_java_sdk_library_import {
+uwb_prebuilt_java_sdk_library_import {
name: "framework-uwb",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
prefer: true,
soong_config_variables: {
- module_build_from_source: {
+ source_build: {
prefer: false,
},
},
@@ -162,12 +187,12 @@
jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-uwb.jar"],
}
-module_java_import {
+uwb_prebuilt_java_import {
name: "service-uwb",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
prefer: true,
soong_config_variables: {
- module_build_from_source: {
+ source_build: {
prefer: false,
},
},
@@ -205,12 +230,12 @@
standalone_contents: ["uwb-module-sdk_service-uwb@current"],
}
-module_prebuilt_systemserverclasspath_fragment {
+uwb_prebuilt_prebuilt_systemserverclasspath_fragment {
name: "com.android.uwb-systemserverclasspath-fragment",
- // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ // Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
prefer: true,
soong_config_variables: {
- module_build_from_source: {
+ source_build: {
prefer: false,
},
},
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 62adaaa..1ce10ac 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8598386
\ No newline at end of file
+8762358
\ No newline at end of file
