Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Drop prebuilt files to android source tree.
Revert "Drop prebuilt files to android source tree."
Work around dependencies for external/robolectric changing in some builds.
Work around dependencies for external/robolectric changing in some builds.
Drop prebuilt files to android source tree.
Change-Id: I3a282acf78771ae100d2f97f7e67be04a58566c0
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index f99b764..a2153cd 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: "T1005032"
+ build_id: "T1005166"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/sdk/conscrypt-module-sdk-current.zip"
}
diff --git a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
index 21d6cbc..a0a0e50 100644
--- a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1005032"
+ build_id: "T1005166"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/host-exports/conscrypt-module-host-exports-current.zip"
}
diff --git a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
index 0365914..b5d1717 100644
--- a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1005032"
+ build_id: "T1005166"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/test-exports/conscrypt-module-test-exports-current.zip"
}
diff --git a/current/host-exports/Android.bp b/current/host-exports/Android.bp
index 2daa720..26a3cad 100644
--- a/current/host-exports/Android.bp
+++ b/current/host-exports/Android.bp
@@ -16,6 +16,7 @@
visibility: [
"//build/make/tools/signapk",
"//external/conscrypt",
+ "//external/robolectric:__subpackages__",
"//tools/apksig",
],
apex_available: ["//apex_available:platform"],
diff --git a/current/host-exports/snapshot-creation-build-number.txt b/current/host-exports/snapshot-creation-build-number.txt
index aa68cf3..6a0c947 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9033549
\ No newline at end of file
+9279850
\ No newline at end of file
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index aa68cf3..6a0c947 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9033549
\ No newline at end of file
+9279850
\ No newline at end of file
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 15fe7ba..f583e98 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -17,6 +17,7 @@
"//art/build",
"//external/conscrypt",
"//external/robolectric-shadows",
+ "//external/robolectric:__subpackages__",
"//frameworks/layoutlib",
],
apex_available: ["//apex_available:platform"],
diff --git a/current/test-exports/snapshot-creation-build-number.txt b/current/test-exports/snapshot-creation-build-number.txt
index aa68cf3..6a0c947 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9033549
\ No newline at end of file
+9279850
\ No newline at end of file