From 238dd8a83c19fe04d1aa54bf518b5deb200abc2a Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 27 Apr 2017 17:52:45 -0700 Subject: [PATCH] nfc: Android.mk -> Android.bp Test: links Change-Id: Ia19dafb3ff6bf5772d72133bb2e1687226e0d44f --- nfc/1.0/default/Android.bp | 21 +++++++++++++++++++++ nfc/1.0/default/Android.mk | 25 ------------------------- 2 files changed, 21 insertions(+), 25 deletions(-) delete mode 100644 nfc/1.0/default/Android.mk diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp index a157f861ce..d7f720308e 100644 --- a/nfc/1.0/default/Android.bp +++ b/nfc/1.0/default/Android.bp @@ -16,3 +16,24 @@ cc_library_shared { "android.hardware.nfc@1.0", ], } + +cc_binary { + name: "android.hardware.nfc@1.0-service", + relative_install_path: "hw", + proprietary: true, + init_rc: ["android.hardware.nfc@1.0-service.rc"], + srcs: ["service.cpp"], + + shared_libs: [ + "liblog", + "libcutils", + "libdl", + "libbase", + "libutils", + "libhardware", + "libhidlbase", + "libhidltransport", + "android.hardware.nfc@1.0", + ], + +} diff --git a/nfc/1.0/default/Android.mk b/nfc/1.0/default/Android.mk deleted file mode 100644 index 4afad748a3..0000000000 --- a/nfc/1.0/default/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.nfc@1.0-service -LOCAL_INIT_RC := android.hardware.nfc@1.0-service.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - libhardware \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.nfc@1.0 \ - - -include $(BUILD_EXECUTABLE)