summaryrefslogtreecommitdiffstats
path: root/keymaster
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-09-26 08:20:46 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-26 08:20:46 -0700
commit6962c45657ad7e514f57880cec7d93720cad0693 (patch)
tree452b252e80f18411f32cef9483c9bbe64e223eef /keymaster
parentd45e49b4b30005b4eecb76ce7d22a0586a6d1513 (diff)
parent135b3a4417bc5c57b4b601a8026043bb65329356 (diff)
downloadplatform_hardware_interfaces-6962c45657ad7e514f57880cec7d93720cad0693.tar.gz
platform_hardware_interfaces-6962c45657ad7e514f57880cec7d93720cad0693.tar.bz2
platform_hardware_interfaces-6962c45657ad7e514f57880cec7d93720cad0693.zip
Merge "Use libcrypto_static instead of libcrypto" am: c048c187be am: 06b758a918 am: 978e59e401
am: 135b3a4417 Change-Id: I2ae264a5c9998b7c6a2a4bb868e313161f1a3701
Diffstat (limited to 'keymaster')
-rw-r--r--keymaster/3.0/vts/functional/Android.bp2
-rw-r--r--keymaster/4.0/vts/functional/Android.bp2
2 files changed, 2 insertions, 2 deletions
diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp
index b0371c79ef..69aa56d306 100644
--- a/keymaster/3.0/vts/functional/Android.bp
+++ b/keymaster/3.0/vts/functional/Android.bp
@@ -26,7 +26,7 @@ cc_test {
],
static_libs: [
"android.hardware.keymaster@3.0",
- "libcrypto",
+ "libcrypto_static",
"libsoftkeymasterdevice",
],
test_suites: ["general-tests"],
diff --git a/keymaster/4.0/vts/functional/Android.bp b/keymaster/4.0/vts/functional/Android.bp
index 333e408b28..0401362e96 100644
--- a/keymaster/4.0/vts/functional/Android.bp
+++ b/keymaster/4.0/vts/functional/Android.bp
@@ -25,7 +25,7 @@ cc_test {
],
static_libs: [
"android.hardware.keymaster@4.0",
- "libcrypto",
+ "libcrypto_static",
"libkeymaster4support",
"libsoftkeymasterdevice",
],