Merge tag 'android-13.0.0_r16' into int/13/fp3
Android 13.0.0 Release 16 (TQ1A.221205.011)
* tag 'android-13.0.0_r16':
Drop prebuilt files to android source tree.
Drop prebuilt files to android source tree.
Revert^2 "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Drop prebuilt files to android source tree.
DO NOT MERGE Drop prebuilt files to android source tree.
Change-Id: I3aea53522bd434973b4404daaa5a97ac56947586
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index d9d1726..ff5a2a9 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: "T1004275"
+ build_id: "T1005032"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.uwb/sdk/uwb-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Uwb"
- git_branch: "tm-dev"
+ git_branch: "tm-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/Android.bp b/current/Android.bp
index 7c85ed6..26db009 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,41 +1,5 @@
// This is auto-generated. DO NOT EDIT.
-// 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 {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
@@ -43,36 +7,11 @@
}
prebuilt_bootclasspath_fragment {
- name: "uwb-module-sdk_com.android.uwb-bootclasspath-fragment@current",
- sdk_member_name: "com.android.uwb-bootclasspath-fragment",
- visibility: ["//packages/modules/Uwb:__subpackages__"],
- apex_available: ["com.android.uwb"],
- licenses: ["uwb-module-sdk_Android-Apache-2.0@current"],
- contents: ["uwb-module-sdk_framework-uwb@current"],
- fragments: [
- {
- apex: "com.android.art",
- module: "art-bootclasspath-fragment",
- },
- ],
- hidden_api: {
- annotation_flags: "hiddenapi/annotation-flags.csv",
- metadata: "hiddenapi/metadata.csv",
- index: "hiddenapi/index.csv",
- signature_patterns: "hiddenapi/signature-patterns.csv",
- filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
- filtered_flags: "hiddenapi/filtered-flags.csv",
- },
-}
-
-uwb_prebuilt_prebuilt_bootclasspath_fragment {
name: "com.android.uwb-bootclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "uwb_module",
+ var_name: "source_build",
},
visibility: ["//packages/modules/Uwb:__subpackages__"],
apex_available: ["com.android.uwb"],
@@ -95,50 +34,11 @@
}
java_sdk_library_import {
- name: "uwb-module-sdk_framework-uwb@current",
- sdk_member_name: "framework-uwb",
- visibility: ["//visibility:public"],
- apex_available: ["com.android.uwb"],
- licenses: ["uwb-module-sdk_Android-Apache-2.0@current"],
- shared_library: false,
- permitted_packages: [
- "android.uwb",
- "com.android.x.uwb",
- ],
- public: {
- jars: ["sdk_library/public/framework-uwb-stubs.jar"],
- stub_srcs: ["sdk_library/public/framework-uwb.srcjar"],
- current_api: "sdk_library/public/framework-uwb.txt",
- removed_api: "sdk_library/public/framework-uwb-removed.txt",
- annotations: "sdk_library/public/framework-uwb_annotations.zip",
- sdk_version: "module_current",
- },
- system: {
- jars: ["sdk_library/system/framework-uwb-stubs.jar"],
- stub_srcs: ["sdk_library/system/framework-uwb.srcjar"],
- current_api: "sdk_library/system/framework-uwb.txt",
- removed_api: "sdk_library/system/framework-uwb-removed.txt",
- annotations: "sdk_library/system/framework-uwb_annotations.zip",
- sdk_version: "module_current",
- },
- module_lib: {
- jars: ["sdk_library/module-lib/framework-uwb-stubs.jar"],
- stub_srcs: ["sdk_library/module-lib/framework-uwb.srcjar"],
- current_api: "sdk_library/module-lib/framework-uwb.txt",
- removed_api: "sdk_library/module-lib/framework-uwb-removed.txt",
- annotations: "sdk_library/module-lib/framework-uwb_annotations.zip",
- sdk_version: "module_current",
- },
-}
-
-uwb_prebuilt_java_sdk_library_import {
name: "framework-uwb",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "uwb_module",
+ var_name: "source_build",
},
visibility: ["//visibility:public"],
apex_available: ["com.android.uwb"],
@@ -175,26 +75,11 @@
}
java_import {
- name: "uwb-module-sdk_service-uwb@current",
- sdk_member_name: "service-uwb",
- visibility: [
- "//packages/modules/Uwb/apex",
- "//packages/modules/Uwb/service",
- "//packages/modules/Uwb/service/tests/uwbtests/apex",
- ],
- apex_available: ["com.android.uwb"],
- licenses: ["uwb-module-sdk_Android-Apache-2.0@current"],
- jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-uwb.jar"],
-}
-
-uwb_prebuilt_java_import {
name: "service-uwb",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "uwb_module",
+ var_name: "source_build",
},
visibility: [
"//packages/modules/Uwb/apex",
@@ -207,14 +92,6 @@
}
license {
- name: "uwb-module-sdk_Android-Apache-2.0@current",
- sdk_member_name: "Android-Apache-2.0",
- visibility: ["//visibility:private"],
- license_kinds: ["SPDX-license-identifier-Apache-2.0"],
- license_text: ["licenses/build/soong/licenses/LICENSE"],
-}
-
-license {
name: "uwb-module-sdk_Android-Apache-2.0",
visibility: ["//visibility:private"],
license_kinds: ["SPDX-license-identifier-Apache-2.0"],
@@ -222,34 +99,14 @@
}
prebuilt_systemserverclasspath_fragment {
- name: "uwb-module-sdk_com.android.uwb-systemserverclasspath-fragment@current",
- sdk_member_name: "com.android.uwb-systemserverclasspath-fragment",
- visibility: ["//packages/modules/Uwb:__subpackages__"],
- apex_available: ["com.android.uwb"],
- licenses: ["uwb-module-sdk_Android-Apache-2.0@current"],
- standalone_contents: ["uwb-module-sdk_service-uwb@current"],
-}
-
-uwb_prebuilt_prebuilt_systemserverclasspath_fragment {
name: "com.android.uwb-systemserverclasspath-fragment",
// Do not prefer prebuilt if the Soong config variable "source_build" in namespace "uwb_module" is true.
- prefer: true,
- soong_config_variables: {
- source_build: {
- prefer: false,
- },
+ use_source_config_var: {
+ config_namespace: "uwb_module",
+ var_name: "source_build",
},
visibility: ["//packages/modules/Uwb:__subpackages__"],
apex_available: ["com.android.uwb"],
licenses: ["uwb-module-sdk_Android-Apache-2.0"],
standalone_contents: ["service-uwb"],
}
-
-sdk_snapshot {
- name: "uwb-module-sdk@current",
- visibility: ["//packages/modules/Uwb:__subpackages__"],
- bootclasspath_fragments: ["uwb-module-sdk_com.android.uwb-bootclasspath-fragment@current"],
- java_sdk_libs: ["uwb-module-sdk_framework-uwb@current"],
- java_systemserver_libs: ["uwb-module-sdk_service-uwb@current"],
- systemserverclasspath_fragments: ["uwb-module-sdk_com.android.uwb-systemserverclasspath-fragment@current"],
-}
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 1ce10ac..233b869 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8762358
\ No newline at end of file
+9035496
\ No newline at end of file