summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2017-04-27 19:52:45 -0500
committerSteven Moreland2017-04-28 20:21:24 -0500
commit238dd8a83c19fe04d1aa54bf518b5deb200abc2a (patch)
treec42f007ed90e84d9379d2df916971fb084fd143d
parente9b4ab67239ca550321f7180520dae35bc77dd77 (diff)
downloadplatform-hardware-interfaces-238dd8a83c19fe04d1aa54bf518b5deb200abc2a.tar.gz
platform-hardware-interfaces-238dd8a83c19fe04d1aa54bf518b5deb200abc2a.tar.xz
platform-hardware-interfaces-238dd8a83c19fe04d1aa54bf518b5deb200abc2a.zip
nfc: Android.mk -> Android.bp
Test: links Change-Id: Ia19dafb3ff6bf5772d72133bb2e1687226e0d44f
-rw-r--r--nfc/1.0/default/Android.bp21
-rw-r--r--nfc/1.0/default/Android.mk25
2 files changed, 21 insertions, 25 deletions
diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp
index a157f861..d7f72030 100644
--- a/nfc/1.0/default/Android.bp
+++ b/nfc/1.0/default/Android.bp
@@ -16,3 +16,24 @@ cc_library_shared {
16 "android.hardware.nfc@1.0", 16 "android.hardware.nfc@1.0",
17 ], 17 ],
18} 18}
19
20cc_binary {
21 name: "android.hardware.nfc@1.0-service",
22 relative_install_path: "hw",
23 proprietary: true,
24 init_rc: ["android.hardware.nfc@1.0-service.rc"],
25 srcs: ["service.cpp"],
26
27 shared_libs: [
28 "liblog",
29 "libcutils",
30 "libdl",
31 "libbase",
32 "libutils",
33 "libhardware",
34 "libhidlbase",
35 "libhidltransport",
36 "android.hardware.nfc@1.0",
37 ],
38
39}
diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk
deleted file mode 100644
index 4afad748..00000000
--- a/nfc/1.0/default/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
1LOCAL_PATH:= $(call my-dir)
2
3include $(CLEAR_VARS)
4LOCAL_MODULE_RELATIVE_PATH := hw
5LOCAL_PROPRIETARY_MODULE := true
6LOCAL_MODULE := android.hardware.nfc@1.0-service
7LOCAL_INIT_RC := android.hardware.nfc@1.0-service.rc
8LOCAL_SRC_FILES := \
9 service.cpp \
10
11LOCAL_SHARED_LIBRARIES := \
12 liblog \
13 libcutils \
14 libdl \
15 libbase \
16 libutils \
17 libhardware \
18
19LOCAL_SHARED_LIBRARIES += \
20 libhidlbase \
21 libhidltransport \
22 android.hardware.nfc@1.0 \
23
24
25include $(BUILD_EXECUTABLE)