summaryrefslogtreecommitdiffstats
path: root/1.0
diff options
context:
space:
mode:
authorGaurav Singhal <gsinghal@codeaurora.org>2017-06-21 13:00:42 +0530
committerGaurav Singhal <gsinghal@codeaurora.org>2017-06-21 13:07:24 +0530
commit607c5008b153177574b1f07b88d3cdfb22aab019 (patch)
treed4cd116cb1e9414d0bed9a75c9c72e85c159d761 /1.0
parent872461c7b315aaee7a4571b6eff95d0c171f23d7 (diff)
downloadandroid_vendor_nxp_interfaces_opensource_nfc-607c5008b153177574b1f07b88d3cdfb22aab019.tar.gz
android_vendor_nxp_interfaces_opensource_nfc-607c5008b153177574b1f07b88d3cdfb22aab019.tar.bz2
android_vendor_nxp_interfaces_opensource_nfc-607c5008b153177574b1f07b88d3cdfb22aab019.zip
NFC: Copy HAL lib to system and vendor partition
HAL library is needed by client and server process, client is part of system and server is part of vendor so we need HAL library in both the partition. HAL library copy to vendor partition as well to fix NFC crash with full treble. Change-Id: I32e0c205e512ea21916ebd9a5fb9fc2448c8ede6
Diffstat (limited to '1.0')
-rw-r--r--1.0/Android.bp26
-rw-r--r--1.0/default/Android.bp2
-rw-r--r--1.0/default/Android.mk2
3 files changed, 28 insertions, 2 deletions
diff --git a/1.0/Android.bp b/1.0/Android.bp
index a87ac05..e5b3752 100644
--- a/1.0/Android.bp
+++ b/1.0/Android.bp
@@ -41,6 +41,32 @@ genrule {
cc_library_shared {
name: "vendor.nxp.hardware.nfc@1.0",
+ defaults: ["hidl-module-defaults"],
+ generated_sources: ["vendor.nxp.hardware.nfc@1.0_genc++"],
+ generated_headers: ["vendor.nxp.hardware.nfc@1.0_genc++_headers"],
+ export_generated_headers: ["vendor.nxp.hardware.nfc@1.0_genc++_headers"],
+ vendor_available: true,
+ shared_libs: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "liblog",
+ "libutils",
+ "libcutils",
+ "android.hidl.base@1.0",
+ ],
+ export_shared_lib_headers: [
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hidl.base@1.0",
+ ],
+}
+
+cc_library_shared {
+ name: "vendor.nxp.hardware.nfc@1.0_vendor",
+ defaults: ["hidl-module-defaults"],
generated_sources: ["vendor.nxp.hardware.nfc@1.0_genc++"],
generated_headers: ["vendor.nxp.hardware.nfc@1.0_genc++_headers"],
export_generated_headers: ["vendor.nxp.hardware.nfc@1.0_genc++_headers"],
diff --git a/1.0/default/Android.bp b/1.0/default/Android.bp
index f7e60e5..bf88254 100644
--- a/1.0/default/Android.bp
+++ b/1.0/default/Android.bp
@@ -11,7 +11,7 @@ cc_library_shared {
"libhidlbase",
"libhidltransport",
"libutils",
- "vendor.nxp.hardware.nfc@1.0",
+ "vendor.nxp.hardware.nfc@1.0_vendor",
"android.hidl.base@1.0",
],
}
diff --git a/1.0/default/Android.mk b/1.0/default/Android.mk
index 3ac4278..74d5e84 100644
--- a/1.0/default/Android.mk
+++ b/1.0/default/Android.mk
@@ -21,6 +21,6 @@ LOCAL_SHARED_LIBRARIES += \
libhidlbase \
libhidltransport \
android.hardware.nfc@1.0 \
- vendor.nxp.hardware.nfc@1.0 \
+ vendor.nxp.hardware.nfc@1.0_vendor \
include $(BUILD_EXECUTABLE)