Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert "Drop prebuilt files to android source tree."
Revert submission 19676048-b/238423099
Reason for revert: multiple presubmit test failures
Reverted Changes:
If1ea6bc02:Drop prebuilt files to android source tree.
I00096529f:Drop prebuilt files to android source tree.
Ic880a64de:Drop prebuilt files to android source tree.
I73a0e21bd:Drop prebuilt files to android source tree.
Ib05de9612:Drop prebuilt files to android source tree.
Ib000b0311:Drop prebuilt files to android source tree.
I207854b91:Drop prebuilt files to android source tree.
Ib61981f79:Drop prebuilt files to android source tree.
I2465ab127:Drop prebuilt files to android source tree.
Ibdf3b6aa8:Drop prebuilt files to android source tree.
I18963eb36:Drop prebuilt files to android source tree.
Ic165aaee7:Drop prebuilt files to android source tree.
Ieeda50a98:Drop prebuilt files to android source tree.
Iafe52654d:Drop prebuilt files to android source tree.
I752df74c3:Drop prebuilt files to android source tree.
Ic5ffbe97e:Drop prebuilt files to android source tree.
Ib591ad65e:Drop prebuilt files to android source tree.
If1b95e486:Drop prebuilt files to android source tree.
I781d35227:Drop prebuilt files to android source tree.
I9fc25eaa8:Drop prebuilt files to android source tree.
I60eab0969:Drop prebuilt files to android source tree.
I12a25fa01:Drop prebuilt files to android source tree.
I8a292d5c2:Drop prebuilt files to android source tree.
I9d8758342:Drop prebuilt files to android source tree.
I87b4c0be0:Drop prebuilt files to android source tree.
I3c54aa2bb:Drop prebuilt files to android source tree.
I04556a840:Drop prebuilt files to android source tree.
If360766c3:Drop prebuilt files to android source tree.
Ib8a142caa:Drop prebuilt files to android source tree.
I4c3ff01d6:Drop prebuilt files to android source tree.
I2b2c12405:Drop prebuilt files to android source tree.
I4bb9fccb1:Drop prebuilt files to android source tree.
Ifb921cfbe:Drop prebuilt files to android source tree.
I2229734a3:Drop prebuilt files to android source tree.
Iab486cbcb:Drop prebuilt files to android source tree.
I5708756d3:Drop prebuilt files to android source tree.
Ie131fdec8:Drop prebuilt files to android source tree.
I3a75319fe:Drop prebuilt files to android source tree.
I198f91e34:Drop prebuilt files to android source tree.
I9f2d419f9:Drop prebuilt files to android source tree.
I4b89e9c99:Drop prebuilt files to android source tree.
I79e547f2b:Drop prebuilt files to android source tree.
Ibc93421dc:Drop prebuilt files to android source tree.
Ib6ed2bba2:Drop prebuilt files to android source tree.
Change-Id: Ia1df381b88c14b57608fb0361c0b854c4f2058c3
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index ec28fd9..6376125 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: "T1004614"
+ build_id: "T1004275"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/sdk/conscrypt-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/conscrypt"
- git_branch: "master"
+ git_branch: "tm-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
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 08cfe30..bd6e33a 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: "T1004614"
+ build_id: "T1004275"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/host-exports/conscrypt-module-host-exports-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/conscrypt"
- git_branch: "master"
+ git_branch: "tm-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
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 c42f47f..ca971e3 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: "T1004614"
+ build_id: "T1004275"
target: "train_build"
source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.conscrypt/test-exports/conscrypt-module-test-exports-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/conscrypt"
- git_branch: "master"
+ git_branch: "tm-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/current/Android.bp b/current/Android.bp
index 3917793..77caee5 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -137,7 +137,6 @@
"//external/conscrypt",
"//frameworks/base",
"//frameworks/base/api",
- "//libcore",
"//packages/modules/IPsec",
"//packages/modules/common/sdk",
"//prebuilts:__subpackages__",
@@ -185,7 +184,6 @@
"//external/conscrypt",
"//frameworks/base",
"//frameworks/base/api",
- "//libcore",
"//packages/modules/IPsec",
"//packages/modules/common/sdk",
"//prebuilts:__subpackages__",
@@ -226,7 +224,6 @@
"//build/soong/java/core-libraries",
"//external/conscrypt",
"//external/wycheproof",
- "//libcore/mmodules/core_platform_api",
"//prebuilts:__subpackages__",
],
apex_available: ["//apex_available:platform"],
@@ -254,7 +251,6 @@
"//build/soong/java/core-libraries",
"//external/conscrypt",
"//external/wycheproof",
- "//libcore/mmodules/core_platform_api",
"//prebuilts:__subpackages__",
],
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 012bf4f..3089ed6 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8843487
\ No newline at end of file
+8762324
\ No newline at end of file
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 012bf4f..3089ed6 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8843487
\ No newline at end of file
+8762324
\ No newline at end of file
diff --git a/current/test-exports/snapshot-creation-build-number.txt b/current/test-exports/snapshot-creation-build-number.txt
index 012bf4f..3089ed6 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-8843487
\ No newline at end of file
+8762324
\ No newline at end of file
