DO NOT MERGE: Drop prebuilt files to android source tree.
The following files have been updated as part of this change:
go/current/Android.bp
go/current/snapshot-creation-build-number.txt
go/current/sdk_library/system/conscrypt-removed.txt
go/current/sdk_library/system/conscrypt-stubs.jar
go/current/sdk_library/system/conscrypt.srcjar
go/current/sdk_library/system/conscrypt.txt
go/current/sdk_library/system/conscrypt_annotations.zip
go/current/sdk_library/public/conscrypt-coreplatform-removed.txt
go/current/sdk_library/public/conscrypt-coreplatform-stubs.jar
go/current/sdk_library/public/conscrypt-coreplatform.srcjar
go/current/sdk_library/public/conscrypt-coreplatform.txt
go/current/sdk_library/public/conscrypt-removed.txt
go/current/sdk_library/public/conscrypt-stubs.jar
go/current/sdk_library/public/conscrypt.module.intra.core.api-removed.txt
go/current/sdk_library/public/conscrypt.module.intra.core.api-stubs.jar
go/current/sdk_library/public/conscrypt.module.intra.core.api.srcjar
go/current/sdk_library/public/conscrypt.module.intra.core.api.txt
go/current/sdk_library/public/conscrypt.srcjar
go/current/sdk_library/public/conscrypt.txt
go/current/sdk_library/public/conscrypt_annotations.zip
go/current/sdk_library/module-lib/conscrypt-removed.txt
go/current/sdk_library/module-lib/conscrypt-stubs.jar
go/current/sdk_library/module-lib/conscrypt.srcjar
go/current/sdk_library/module-lib/conscrypt.txt
go/current/sdk_library/module-lib/conscrypt_annotations.zip
go/current/arm/lib/libconscrypt_jni.so
go/current/host-exports/Android.bp
go/current/host-exports/snapshot-creation-build-number.txt
go/current/host-exports/linux_bionic/x86_64/lib/libconscrypt_openjdk_jni.so
go/current/host-exports/licenses/external/conscrypt/LICENSE
go/current/host-exports/licenses/external/conscrypt/NOTICE
go/current/host-exports/licenses/external/conscrypt/licenses/LICENSE.harmony.txt
go/current/host-exports/licenses/external/conscrypt/licenses/LICENSE.netty.txt
go/current/host-exports/java/linux_bionic/conscrypt-unbundled.jar
go/current/host-exports/java/linux_glibc/conscrypt-unbundled.jar
go/current/host-exports/linux_glibc/x86/lib/libconscrypt_openjdk_jni.so
go/current/host-exports/linux_glibc/x86_64/lib/libconscrypt_openjdk_jni.so
go/current/licenses/external/conscrypt/LICENSE
go/current/licenses/external/conscrypt/NOTICE
go/current/licenses/external/conscrypt/licenses/LICENSE.harmony.txt
go/current/licenses/external/conscrypt/licenses/LICENSE.netty.txt
go/current/java_boot_libs/snapshot/jars/are/invalid/conscrypt.jar
go/current/hiddenapi/annotation-flags.csv
go/current/hiddenapi/filtered-flags.csv
go/current/hiddenapi/filtered-stub-flags.csv
go/current/hiddenapi/hiddenapi-max-target-o-low-priority.txt
go/current/hiddenapi/index.csv
go/current/hiddenapi/metadata.csv
go/current/hiddenapi/signature-patterns.csv
go/current/arm64/lib/libconscrypt_jni.so
go/current/x86/lib/libconscrypt_jni.so
go/current/test-exports/Android.bp
go/current/test-exports/snapshot-creation-build-number.txt
go/current/test-exports/linux_bionic/x86_64/lib/libjavacrypto.so
go/current/test-exports/licenses/external/conscrypt/LICENSE
go/current/test-exports/licenses/external/conscrypt/NOTICE
go/current/test-exports/licenses/external/conscrypt/licenses/LICENSE.harmony.txt
go/current/test-exports/licenses/external/conscrypt/licenses/LICENSE.netty.txt
go/current/test-exports/java/conscrypt-for-host.jar
go/current/test-exports/java/conscrypt-tests-AndroidTest.xml
go/current/test-exports/java/conscrypt-tests.jar
go/current/test-exports/linux_glibc/x86/lib/libjavacrypto.so
go/current/test-exports/linux_glibc/x86_64/lib/libjavacrypto.so
go/current/test-exports/android/arm/lib/libjavacrypto.so
go/current/test-exports/android/arm64/lib/libjavacrypto.so
go/current/test-exports/android/x86/lib/libjavacrypto.so
go/current/test-exports/android/x86_64/lib/libjavacrypto.so
go/current/x86_64/lib/libconscrypt_jni.so
Built here: ab/T1008598
This build IS suitable for public release.
The change is generated with prebuilt drop tool.
Test: presubmit
Bug: 313461440
Change-Id: I545150c7b48d16c79dd531bfe3cb3059583cfa41
diff --git a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
index 26cb5e2..d35cbfd 100644
--- a/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1007188"
+ build_id: "T1008598"
target: "train_build"
source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.conscrypt/sdk/conscrypt-module-sdk-current.zip"
}
@@ -8,7 +8,7 @@
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/conscrypt"
- git_branch: "udc-dev"
+ git_branch: "udc-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_go_current_host-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_host-exports_current_zip.asciipb
index 9b9bb95..579c28c 100644
--- a/.prebuilt_info/prebuilt_info_go_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_host-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1007188"
+ build_id: "T1008598"
target: "train_build"
source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.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: "udc-dev"
+ git_branch: "udc-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/.prebuilt_info/prebuilt_info_go_current_test-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_go_current_test-exports_current_zip.asciipb
index 7908191..544d9dd 100644
--- a/.prebuilt_info/prebuilt_info_go_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_go_current_test-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "T1007188"
+ build_id: "T1008598"
target: "train_build"
source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.go.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: "udc-dev"
+ git_branch: "udc-qpr-dev"
transform: TRANSFORM_UNZIP
transform_options {
}
diff --git a/go/current/host-exports/snapshot-creation-build-number.txt b/go/current/host-exports/snapshot-creation-build-number.txt
index f9eedbc..d33d0a0 100644
--- a/go/current/host-exports/snapshot-creation-build-number.txt
+++ b/go/current/host-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058
\ No newline at end of file
+10572802
\ No newline at end of file
diff --git a/go/current/snapshot-creation-build-number.txt b/go/current/snapshot-creation-build-number.txt
index f9eedbc..d33d0a0 100644
--- a/go/current/snapshot-creation-build-number.txt
+++ b/go/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058
\ No newline at end of file
+10572802
\ No newline at end of file
diff --git a/go/current/test-exports/snapshot-creation-build-number.txt b/go/current/test-exports/snapshot-creation-build-number.txt
index f9eedbc..d33d0a0 100644
--- a/go/current/test-exports/snapshot-creation-build-number.txt
+++ b/go/current/test-exports/snapshot-creation-build-number.txt
@@ -1 +1 @@
-10414058
\ No newline at end of file
+10572802
\ No newline at end of file
