commit baa41d7945b7f1f766b70cfae14d7c98d2ec6da1
author David Zeuthen <zeuthen@google.com> Fri Jun 12 14:50:21 2020 -0400
committer David Zeuthen <zeuthen@google.com> Fri Jun 12 14:52:37 2020 -0400
tree b3529ff3200a2d15f5f28a2d1320cfbb2d5327f0
parent d3fbe19e6baca630d1865d8376e6955c417d46bc

Identity: Statically link VTS test binary.

The VTS test was dynamically linking some libraries not normally
present on an Android system. Statically link these libraries instead.

Bug: 158150767
Test: atest VtsHalIdentityTargetTest
Change-Id: Ida85ca8835d0243c47f451ccdfa0d11d29ec1bdb

identity/aidl/vts/Android.bp

diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp
index 58473dc..cd6f9b0 100644
--- a/identity/aidl/vts/Android.bp
+++ b/identity/aidl/vts/Android.bp
@@ -17,13 +17,13 @@
         "android.hardware.keymaster@4.0",
         "libbinder",
         "libcrypto",
-        "libkeymaster_portable",
-        "libsoft_attestation_cert",
-        "libpuresoftkeymasterdevice",
         "android.hardware.keymaster-ndk_platform",
     ],
     static_libs: [
         "libcppbor",
+        "libkeymaster_portable",
+        "libsoft_attestation_cert",
+        "libpuresoftkeymasterdevice",
         "android.hardware.identity-support-lib",
         "android.hardware.identity-cpp",
         "android.hardware.keymaster-cpp",