commit 263d2df2c7ce640e9da3fda95bb16d8a2d221382
author Colin Cross <ccross@android.com> Wed Sep 18 11:07:09 2019 -0700
committer Colin Cross <ccross@android.com> Wed Sep 18 11:07:09 2019 -0700
tree 6c639c2efc9f7ebf9420669e3b24051e12b56424
parent 29d90d1455eb5aa94764a0eeb9e1395d6aec2e61

Use libcrypto_static instead of libcrypto

Replace libcrypto with libcrypto_static, which can be protected through
visibility to ensure only modules that don't affect FIPS certification
can use it.

Bug: 141248879
Test: m checkbuild
Change-Id: I8685cb06d15f3425eeb96d998ffda54c82dcd387

keymaster/3.0/vts/functional/Android.bp

diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp
index b0371c7..69aa56d 100644
--- a/keymaster/3.0/vts/functional/Android.bp
+++ b/keymaster/3.0/vts/functional/Android.bp
@@ -26,7 +26,7 @@
     ],
     static_libs: [
         "android.hardware.keymaster@3.0",
-        "libcrypto",
+        "libcrypto_static",
         "libsoftkeymasterdevice",
     ],
     test_suites: ["general-tests"],

keymaster/4.0/vts/functional/Android.bp

diff --git a/keymaster/4.0/vts/functional/Android.bp b/keymaster/4.0/vts/functional/Android.bp
index 333e408..0401362 100644
--- a/keymaster/4.0/vts/functional/Android.bp
+++ b/keymaster/4.0/vts/functional/Android.bp
@@ -25,7 +25,7 @@
     ],
     static_libs: [
         "android.hardware.keymaster@4.0",
-        "libcrypto",
+        "libcrypto_static",
         "libkeymaster4support",
         "libsoftkeymasterdevice",
     ],