Snap for 11903762 from 3c48865f006f9649dad3fe90d091c5d448136fec to emu-35-1-releaseemu-35-1-release

Change-Id: I4f421b94f06fd4e942c6b3410f7f3c1144f9e70d

1 files changed, 43 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index 9b5004c3..6082f430 100644
--- a/Android.bp
+++ b/Android.bp
@@ -92,6 +92,8 @@ cc_defaults {
     local_include_dirs: ["src/include"],
     export_include_dirs: ["src/include"],
     cflags: ["-DBORINGSSL_IMPLEMENTATION"],
+
+    cmake_snapshot_supported: true,
 }
 
 //// libcrypto, but not libcrypto_baremetal. libcrypto_baremetal is a single
@@ -178,9 +180,6 @@ cc_object {
         "//apex_available:platform",
         "com.android.adbd",
         "com.android.adservices",
-        "com.android.art",
-        "com.android.art.debug",
-        "com.android.art.testing",
         "com.android.btservices",
         "com.android.compos",
         "com.android.conscrypt",
@@ -283,9 +282,6 @@ cc_library {
         "//apex_available:platform",
         "com.android.adbd",
         "com.android.adservices",
-        "com.android.art",
-        "com.android.art.debug",
-        "com.android.art.testing",
         "com.android.btservices",
         "com.android.compos",
         "com.android.conscrypt",
@@ -348,8 +344,6 @@ cc_library {
 cc_library_static {
     name: "libcrypto_static",
     visibility: [
-        "//art/build/sdk",
-        "//art/dex2oat", // Only for test use (note this module isn't in apex_available).
         "//bootable/recovery/updater",
         "//bootable/deprecated-ota/updater",
         "//external/conscrypt",
@@ -412,6 +406,46 @@ cc_library_static {
     ],
 }
 
+// For static linking into the ART module to provide limited functionality:
+// bignums and SHA1 for ELF checksums.
+cc_library_static {
+    name: "libcrypto_for_art",
+    defaults: [
+        "libcrypto_defaults",
+        "boringssl_defaults",
+    ],
+    srcs: [
+        "src/crypto/cpu_*.c",
+        "src/crypto/crypto.c",
+        "src/crypto/err/err.c",
+        "src/crypto/fipsmodule/bn/*.c",
+        "src/crypto/fipsmodule/bn/asm/*.c",
+        "src/crypto/fipsmodule/rand/*.c",
+        "src/crypto/fipsmodule/sha/sha1.c",
+        "src/crypto/mem.c",
+        "src/crypto/stack/stack.c",
+        "src/crypto/thread_pthread.c",
+        "src/gen/crypto/err_data.c",
+    ],
+    target: {
+        linux: {
+            srcs: [
+                "src/gen/bcm/*-linux.S",
+            ],
+        },
+    },
+    visibility: [
+        "//art:__subpackages__",
+        "//libcore:__subpackages__",
+    ],
+    apex_available: [
+        "com.android.art",
+        "com.android.art.debug",
+        "com.android.art.testing",
+    ],
+    min_sdk_version: "29",
+}
+
 // Common defaults for lib*_fuzz_unsafe. These are unsafe and deterministic
 // libraries for testing and fuzzing only. See src/FUZZING.md.
 cc_defaults {
@@ -895,6 +929,7 @@ rust_library_rlib {
 rust_defaults {
     name: "libbssl_crypto_defaults",
     crate_name: "bssl_crypto",
+    visibility: ["//visibility:public"],
     srcs: ["src/rust/bssl-crypto/src/lib.rs"],
     rustlibs: ["libbssl_sys"],
 }
@@ -907,9 +942,6 @@ rust_library {
         "//apex_available:platform",
         "com.android.virt",
     ],
-    visibility: [
-        "//external/rust/beto-rust/nearby",
-    ],
     vendor_available: true,
     product_available: true,
 }