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."
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.
Change-Id: I00abc0fab5488655179b435693718ead29cf7079
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 82ca2bb..099134b 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.art/host-exports/art-module-host-exports-current.zip"
}
diff --git a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
index 78fbd09..998f04d 100644
--- a/.prebuilt_info/prebuilt_info_current_sdk_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_sdk_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.art/sdk/art-module-sdk-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 7397e58..1eb70e9 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.art/test-exports/art-module-test-exports-current.zip"
}
diff --git a/current/host-exports/snapshot-creation-build-number.txt b/current/host-exports/snapshot-creation-build-number.txt
index bdc0d66..45fa262 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9106705
\ No newline at end of file
+9279840
\ No newline at end of file
diff --git a/current/sdk/snapshot-creation-build-number.txt b/current/sdk/snapshot-creation-build-number.txt
index bdc0d66..45fa262 100644
--- a/current/sdk/snapshot-creation-build-number.txt
+++ b/current/sdk/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9106705
\ No newline at end of file
+9279840
\ No newline at end of file
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 869704d..1424b2a 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -139,6 +139,7 @@
visibility: [
"//art/build/sdk",
"//external/robolectric-shadows",
+ "//external/robolectric",
"//frameworks/layoutlib",
"//libcore",
"//prebuilts:__subpackages__",
@@ -159,6 +160,7 @@
"//art/build/sdk",
"//external/okhttp",
"//external/robolectric-shadows",
+ "//external/robolectric",
"//prebuilts:__subpackages__",
],
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 bdc0d66..45fa262 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-9106705
\ No newline at end of file
+9279840
\ No newline at end of file