commit fe24c44f0b36ce3c680fea87a5de699f27e5b5d8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Feb 25 13:04:47 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Feb 25 13:04:47 2023 +0000
tree d1dc8702f5d78bb89993799acbb87dc6a921d425
parent 88e8c9313a75765f6e7f639dce1dbf460324eb23
parent 1de6311425f847007410753f46c3baf1da987561

Snap for 9656615 from 1de6311425f847007410753f46c3baf1da987561 to mainline-media-release

Change-Id: Icf280f162d1ce9688fa60133770205646ece3c3e

Android.bp

diff --git a/Android.bp b/Android.bp
index 5544af7..195d79d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -502,11 +502,7 @@
 
     cflags: ["-DJNI_JARJAR_PREFIX=com/android/"],
     header_libs: ["libnativehelper_header_only"],
-    shared_libs: [
-        "libcrypto",
-        "liblog",
-        "libssl",
-    ],
+    shared_libs: ["liblog"],
 
     target: {
         darwin: {
@@ -514,9 +510,19 @@
         },
         android: {
             runtime_libs: ["libandroidio"],
+            shared_libs: [
+                "libcrypto",
+                "libssl",
+            ],
         },
         not_windows: {
             runtime_libs: ["libandroidio"],
+            // Link libcrypto and libssl statically on host, to ensure they stay current in
+            // the prebuilt that's included in conscrypt-module-test-exports.
+            static_libs: [
+                "libcrypto",
+                "libssl",
+            ],
         },
     },
     apex_available: [
@@ -713,7 +719,6 @@
                 // For use by CTS
                 "conscrypt-tests",
             ],
-            // TODO: Remove this when we resolve b/151303681.
             native_shared_libs: [
                 "libjavacrypto",
             ],