diff options
Diffstat (limited to 'nfc')
| -rw-r--r-- | nfc/1.0/Android.bp | 17 | ||||
| -rw-r--r-- | nfc/1.0/default/Android.bp | 3 | ||||
| -rw-r--r-- | nfc/1.0/default/Android.mk | 3 | ||||
| -rw-r--r-- | nfc/1.0/default/android.hardware.nfc@1.0-service.rc | 2 | ||||
| -rw-r--r-- | nfc/Android.bp | 5 |
5 files changed, 22 insertions, 8 deletions
diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index d9f197ecf3..9584636d56 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0/Android.bp @@ -2,8 +2,8 @@ genrule { name: "android.hardware.nfc@1.0_genc++", - tool: "hidl-gen", - cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0", srcs: [ "types.hal", "INfc.hal", @@ -18,8 +18,8 @@ genrule { genrule { name: "android.hardware.nfc@1.0_genc++_headers", - tool: "hidl-gen", - cmd: "$tool -o $genDir -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0", + tools: ["hidl-gen"], + cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.nfc@1.0", srcs: [ "types.hal", "INfc.hal", @@ -46,9 +46,16 @@ cc_library_shared { generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], shared_libs: [ - "libhidl", + "libhidlbase", + "libhidltransport", "libhwbinder", "libutils", "libcutils", ], + export_shared_lib_headers: [ + "libhidlbase", + "libhidltransport", + "libhwbinder", + "libutils", + ], } diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp index a8c4c81cfb..b484ba6046 100644 --- a/nfc/1.0/default/Android.bp +++ b/nfc/1.0/default/Android.bp @@ -10,7 +10,8 @@ cc_library_shared { "libbase", "libcutils", "libutils", - "libhidl", + "libhidlbase", + "libhidltransport", "android.hardware.nfc@1.0", ], } diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk index d4e46f8555..a6c7d5ca5f 100644 --- a/nfc/1.0/default/Android.mk +++ b/nfc/1.0/default/Android.mk @@ -18,7 +18,8 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES += \ libhwbinder \ - libhidl \ + libhidlbase \ + libhidltransport \ android.hardware.nfc@1.0 \ include $(BUILD_EXECUTABLE) diff --git a/nfc/1.0/default/android.hardware.nfc@1.0-service.rc b/nfc/1.0/default/android.hardware.nfc@1.0-service.rc index 1d427188c1..7b67577c3a 100644 --- a/nfc/1.0/default/android.hardware.nfc@1.0-service.rc +++ b/nfc/1.0/default/android.hardware.nfc@1.0-service.rc @@ -1,4 +1,4 @@ service nfc_hal_service /system/bin/hw/android.hardware.nfc@1.0-service class hal user nfc - group nfc readproc + group nfc diff --git a/nfc/Android.bp b/nfc/Android.bp new file mode 100644 index 0000000000..ba90f2c9d1 --- /dev/null +++ b/nfc/Android.bp @@ -0,0 +1,5 @@ +// This is an autogenerated file, do not edit. +subdirs = [ + "1.0", + "1.0/default", +] |