commit 0c346ff433e3d700882aa6a22504d082cf125a38
author David Zeuthen <zeuthen@google.com> Thu Jun 18 16:29:22 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 18 16:29:22 2020 +0000
tree 4fccfab8d03e3eebec668112e0e80dfcf3aff0da
parent 9b423c765b644a1735963cfb7a0f3231a571f571
parent 63124a6b0e9b7f3b25fa6189bd14cb4de50f814a

Identity: More static linking of VTS test binary. am: 780f8c860d am: 7fb435ce16 am: c098dafed8 am: 63124a6b0e

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1342874

Change-Id: Ic6352690a9f13604798464d090466ec81e3029a1

identity/aidl/vts/Android.bp

diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp
index cd6f9b0..c1f44e7 100644
--- a/identity/aidl/vts/Android.bp
+++ b/identity/aidl/vts/Android.bp
@@ -14,19 +14,19 @@
         "ReaderAuthTests.cpp",
     ],
     shared_libs: [
-        "android.hardware.keymaster@4.0",
         "libbinder",
         "libcrypto",
-        "android.hardware.keymaster-ndk_platform",
     ],
     static_libs: [
         "libcppbor",
         "libkeymaster_portable",
         "libsoft_attestation_cert",
         "libpuresoftkeymasterdevice",
+        "android.hardware.keymaster@4.0",
         "android.hardware.identity-support-lib",
         "android.hardware.identity-cpp",
         "android.hardware.keymaster-cpp",
+        "android.hardware.keymaster-ndk_platform",
     ],
     test_suites: [
         "general-tests",