diff options
| author | Roshan Pius <rpius@google.com> | 2023-10-03 13:32:23 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2023-10-13 11:00:40 -0700 |
| commit | 8cf17eb36ce8e8bcf79aef1181ab522ca9c988a6 (patch) | |
| tree | 8ec6e5e2ea2171fd34511f024185f333618d3527 /nci/jni | |
| parent | d7b41796c1015dfecacd7f48cfd108b8197055cc (diff) | |
| download | Nfc-8cf17eb36ce8e8bcf79aef1181ab522ca9c988a6.tar.gz | |
nfc(apex): Create NFC apex
Move some shared jni dependencies into static dependencies to reduce
non-formal dependency on platfrom from NFC module.
Only includes the NFC APK as of now. Will include the NFC SDK class
files in the future.
Bug: 303286040
Test: atest CtsNfcTestCases
Merged-In: I8daf17ed3f6a6945f6d8c743b24c4b2d314a73e9
Change-Id: I8daf17ed3f6a6945f6d8c743b24c4b2d314a73e9
Diffstat (limited to 'nci/jni')
| -rw-r--r-- | nci/jni/Android.bp | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/nci/jni/Android.bp b/nci/jni/Android.bp index 074f2a78..a7b12b70 100644 --- a/nci/jni/Android.bp +++ b/nci/jni/Android.bp @@ -10,7 +10,6 @@ cc_library_shared { "-Wextra", "-Wno-unused-parameter", "-Werror", - "-DNXP_UICC_ENABLE", ], @@ -31,13 +30,27 @@ cc_library_shared { "libcutils", "libutils", "liblog", - "libnfc-nci", "libchrome", "libbase", - "libstatslog_nfc", + // Treble configuration + "libhidlbase", + "libutils", + "libbinder_ndk", + "libstatssocket", + "libz", ], - static_libs: ["libxml2"], + static_libs: [ + "android.hardware.nfc@1.0", + "android.hardware.nfc@1.1", + "android.hardware.nfc@1.2", + // Add for AIDL + "android.hardware.nfc-V1-ndk", + "libnfcutils", + "libnfc-nci", + "libstatslog_nfc", + "libxml2" + ], product_variables: { debuggable: { @@ -52,6 +65,11 @@ cc_library_shared { misc_undefined: ["bounds"], scs: true, }, + stl: "libc++_static", + apex_available: [ + "//apex_available:platform", + "com.android.nfcservices" + ], } cc_test { |