From 8790fa3fdea2b58bb465dd376a293772818c5639 Mon Sep 17 00:00:00 2001 From: Devin Moore Date: Tue, 23 May 2023 23:52:18 +0000 Subject: [PATCH] Add defaults to identity-support-lib For sharing the dependencies with credstore. Test: m Bug: 280829178 Change-Id: I3d0b3f958efa205856360d585a86fb3f853e675d --- identity/support/Android.bp | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/identity/support/Android.bp b/identity/support/Android.bp index 3096fe5f2c..d62d0555bf 100644 --- a/identity/support/Android.bp +++ b/identity/support/Android.bp @@ -22,15 +22,8 @@ package { default_applicable_licenses: ["hardware_interfaces_license"], } -cc_library { - name: "android.hardware.identity-support-lib", - vendor_available: true, - srcs: [ - "src/IdentityCredentialSupport.cpp", - ], - export_include_dirs: [ - "include", - ], +cc_defaults { + name: "android.hardware.identity-support-lib-deps", shared_libs: [ "android.hardware.keymaster@4.0", "libcrypto", @@ -47,19 +40,36 @@ cc_library { ], } +cc_library { + name: "android.hardware.identity-support-lib", + vendor_available: true, + defaults: [ + "android.hardware.identity-support-lib-deps", + ], + srcs: [ + "src/IdentityCredentialSupport.cpp", + ], + export_include_dirs: [ + "include", + ], +} + cc_test { name: "android.hardware.identity-support-lib-test", srcs: [ "tests/IdentityCredentialSupportTest.cpp", ], + defaults: [ + "android.hardware.identity-support-lib-deps", + ], shared_libs: [ - "android.hardware.identity-support-lib", "libcrypto", "libbase", "libhidlbase", "libhardware", ], static_libs: [ + "android.hardware.identity-support-lib", "libcppbor_external", "libgmock", ],