Convert system/nfc/Android.mk to Android.bp
Test: Compiles
Change-Id: I4ccee296486fbc2663204587656dd818b271fc88
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..764e0cb
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,43 @@
+subdirs = ["src"]
+cc_library_shared {
+ name: "nfc_nci.bcm2079x.default",
+ relative_install_path: "hw",
+ srcs: [
+ "halimpl/bcm2079x/gki/common/*.c",
+ "halimpl/bcm2079x/gki/ulinux/*.c",
+ "halimpl/bcm2079x/hal/hal/*.c",
+ "halimpl/bcm2079x/adaptation/*.cpp",
+ "halimpl/bcm2079x/adaptation/*.c",
+ "halimpl/bcm2079x/nfc_nci.c",
+ "src/adaptation/CrcChecksum.cpp",
+ "src/nfca_version.c",
+ ],
+ shared_libs: [
+ "liblog",
+ "libcutils",
+ "libhwbinder",
+ "libbase",
+ "libutils",
+ "libpower",
+ ],
+ local_include_dirs: [
+ "halimpl/bcm2079x/include",
+ "halimpl/bcm2079x/gki/ulinux",
+ "halimpl/bcm2079x/gki/common",
+ "halimpl/bcm2079x/adaptation",
+ "src/hal/include",
+ "src/hal/int",
+ "src/nfc/include",
+ "src/nfa/include",
+ "src/udrv/include",
+ "src/include",
+ ],
+ cflags: [
+ "-DBUILDCFG=1",
+ "-Wno-deprecated-register",
+ "-Wno-unused-parameter",
+ "-Wno-missing-field-initializers",
+ "-DNFC_HAL_TARGET=TRUE",
+ "-DNFC_RW_ONLY=TRUE",
+ ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 1efe848..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-NFA := src/nfa
-NFC := src/nfc
-HAL := src/hal
-UDRV := src/udrv
-HALIMPL := halimpl/bcm2079x
-D_CFLAGS := -DANDROID -DBUILDCFG=1 \
- -Wno-deprecated-register \
- -Wno-unused-parameter \
- -Wno-missing-field-initializers \
-
-
-######################################
-# Build shared library system/lib/libnfc-nci.so for stack code.
-
-include $(CLEAR_VARS)
-LOCAL_ARM_MODE := arm
-LOCAL_MODULE := libnfc-nci
-LOCAL_SHARED_LIBRARIES := libhardware_legacy libcutils liblog libdl libhardware
-LOCAL_CFLAGS := $(D_CFLAGS)
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/src/include \
- $(LOCAL_PATH)/src/gki/ulinux \
- $(LOCAL_PATH)/src/gki/common \
- $(LOCAL_PATH)/$(NFA)/include \
- $(LOCAL_PATH)/$(NFA)/int \
- $(LOCAL_PATH)/$(NFC)/include \
- $(LOCAL_PATH)/$(NFC)/int \
- $(LOCAL_PATH)/src/hal/include \
- $(LOCAL_PATH)/src/hal/int \
- $(LOCAL_PATH)/$(HALIMPL)/include \
- system/libhwbinder/include
-
-# Treble configuration
-LOCAL_SHARED_LIBRARIES += libhidlbase libhidltransport libhwbinder libutils android.hardware.nfc@1.0
-LOCAL_SRC_FILES := \
- $(call all-c-files-under, $(NFA)/ce $(NFA)/dm $(NFA)/ee) \
- $(call all-c-files-under, $(NFA)/hci $(NFA)/int $(NFA)/p2p $(NFA)/rw $(NFA)/sys) \
- $(call all-c-files-under, $(NFC)/int $(NFC)/llcp $(NFC)/nci $(NFC)/ndef $(NFC)/nfc $(NFC)/tags) \
- $(call all-c-files-under, src/adaptation) \
- $(call all-cpp-files-under, src/adaptation) \
- $(call all-c-files-under, src/gki) \
- $(HALIMPL)/adaptation/android_logmsg.cpp \
- src/nfca_version.c
-include $(BUILD_SHARED_LIBRARY)
-
-######################################
-# Build shared library system/lib/hw/nfc_nci.*.so for Hardware Abstraction Layer.
-# Android's generic HAL (libhardware.so) dynamically loads this shared library.
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := nfc_nci.bcm2079x.default
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_SRC_FILES := $(call all-c-files-under, $(HALIMPL)) \
- $(call all-cpp-files-under, $(HALIMPL)) \
- src/adaptation/CrcChecksum.cpp \
- src/nfca_version.c
-LOCAL_SHARED_LIBRARIES := liblog libcutils libhardware_legacy libhwbinder libbase libcutils libutils
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/$(HALIMPL)/include \
- $(LOCAL_PATH)/$(HALIMPL)/gki/ulinux \
- $(LOCAL_PATH)/$(HALIMPL)/gki/common \
- $(LOCAL_PATH)/$(HAL)/include \
- $(LOCAL_PATH)/$(HAL)/int \
- $(LOCAL_PATH)/src/include \
- $(LOCAL_PATH)/$(NFC)/include \
- $(LOCAL_PATH)/$(NFA)/include \
- $(LOCAL_PATH)/$(UDRV)/include
-LOCAL_CFLAGS := $(D_CFLAGS) -DNFC_HAL_TARGET=TRUE -DNFC_RW_ONLY=TRUE
-include $(BUILD_SHARED_LIBRARY)
-
-
-######################################
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/src/Android.bp b/src/Android.bp
new file mode 100644
index 0000000..d1f1860
--- /dev/null
+++ b/src/Android.bp
@@ -0,0 +1,60 @@
+cc_library_shared {
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
+ name: "libnfc-nci",
+ shared_libs: [
+ "libcutils",
+ "liblog",
+ "libdl",
+ "libhardware",
+ "libpower",
+
+ // Treble configuration
+ "libhidlbase",
+ "libhidltransport",
+ "libhwbinder",
+ "libutils",
+ "android.hardware.nfc@1.0",
+ ],
+ cflags: [
+ "-DBUILDCFG=1",
+ "-Wno-deprecated-register",
+ "-Wno-unused-parameter",
+ "-Wno-missing-field-initializers",
+ ],
+ local_include_dirs: [
+ "include",
+ "gki/ulinux",
+ "gki/common",
+ "hal/include",
+ "hal/int",
+ "nfa/include",
+ "nfa/int",
+ "nfc/include",
+ "nfc/int",
+ ],
+ srcs: [
+ "nfa/ce/*.c",
+ "nfa/dm/*.c",
+ "nfa/ee/*.c",
+ "nfa/hci/*.c",
+ "nfa/int/*.c",
+ "nfa/p2p/*.c",
+ "nfa/rw/*.c",
+ "nfa/sys/*.c",
+ "nfc/int/*.c",
+ "nfc/llcp/*.c",
+ "nfc/nci/*.c",
+ "nfc/ndef/*.c",
+ "nfc/nfc/*.c",
+ "nfc/tags/*.c",
+ "adaptation/*.c",
+ "adaptation/*.cpp",
+ "gki/common/*.c",
+ "gki/ulinux/*.c",
+ "nfca_version.c",
+ ],
+}