NFC: Update latest HIDL files

Delete makefile and update bp file to latest generated
using hidl-gen tool for supporting Android P.

Add package to path mapping for compilation and
remove _vendor binder wrapper library.

Change-Id: If11cfe3410925c0fe3097d2754cf2cba164c2927

4 files changed, 9 insertions, 163 deletions

diff --git a/1.0/Android.bp b/1.0/Android.bp
index e5b3752..2316e5b 100644
--- a/1.0/Android.bp
+++ b/1.0/Android.bp
@@ -1,90 +1,17 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
 
-filegroup {
-    name: "vendor.nxp.hardware.nfc@1.0_hal",
+hidl_interface {
+    name: "vendor.nxp.hardware.nfc@1.0",
+    root: "vendor.nxp.hardware",
     srcs: [
         "types.hal",
         "INqNfc.hal",
     ],
-}
-
-genrule {
-    name: "vendor.nxp.hardware.nfc@1.0_genc++",
-    tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hidl:system/libhidl/transport -rvendor.nxp.hardware:vendor/nxp/interfaces/opensource vendor.nxp.hardware.nfc@1.0",
-    srcs: [
-        ":vendor.nxp.hardware.nfc@1.0_hal",
-    ],
-    out: [
-        "vendor/nxp/hardware/nfc/1.0/types.cpp",
-        "vendor/nxp/hardware/nfc/1.0/NqNfcAll.cpp",
-    ],
-}
-
-genrule {
-    name: "vendor.nxp.hardware.nfc@1.0_genc++_headers",
-    tools: ["hidl-gen"],
-    cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hidl:system/libhidl/transport -rvendor.nxp.hardware:vendor/nxp/interfaces/opensource vendor.nxp.hardware.nfc@1.0",
-    srcs: [
-        ":vendor.nxp.hardware.nfc@1.0_hal",
-    ],
-    out: [
-        "vendor/nxp/hardware/nfc/1.0/types.h",
-        "vendor/nxp/hardware/nfc/1.0/hwtypes.h",
-        "vendor/nxp/hardware/nfc/1.0/INqNfc.h",
-        "vendor/nxp/hardware/nfc/1.0/IHwNqNfc.h",
-        "vendor/nxp/hardware/nfc/1.0/BnHwNqNfc.h",
-        "vendor/nxp/hardware/nfc/1.0/BpHwNqNfc.h",
-        "vendor/nxp/hardware/nfc/1.0/BsNqNfc.h",
-    ],
-}
-
-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",
+    interfaces: [
         "android.hidl.base@1.0",
     ],
-    export_shared_lib_headers: [
-        "libhidlbase",
-        "libhidltransport",
-        "libhwbinder",
-        "libutils",
-        "android.hidl.base@1.0",
+    types: [
     ],
+    gen_java: true,
 }
 
-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"],
-    vendor: 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",
-    ],
-}
diff --git a/1.0/Android.mk b/1.0/Android.mk
deleted file mode 100644
index 07ee267..0000000
--- a/1.0/Android.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-# This file is autogenerated by hidl-gen. Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vendor.nxp.hardware.nfc-V1.0-java
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-intermediates := $(call local-generated-sources-dir, COMMON)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-LOCAL_JAVA_LIBRARIES := \
-    android.hidl.base-V1.0-java \
-
-
-#
-# Build INqNfc.hal
-#
-GEN := $(intermediates)/vendor/nxp/hardware/nfc/V1_0/INqNfc.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INqNfc.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.nxp.hardware:vendor/nxp/interfaces/opensource \
-        vendor.nxp.hardware.nfc@1.0::INqNfc
-
-$(GEN): $(LOCAL_PATH)/INqNfc.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-include $(BUILD_JAVA_LIBRARY)
-
-
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vendor.nxp.hardware.nfc-V1.0-java-static
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-intermediates := $(call local-generated-sources-dir, COMMON)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-LOCAL_JAVA_LIBRARIES := \
-    android.hidl.base-V1.0-java \
-
-
-#
-# Build INqNfc.hal
-#
-GEN := $(intermediates)/vendor/nxp/hardware/nfc/V1_0/INqNfc.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INqNfc.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
-$(GEN): $(LOCAL_PATH)/types.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
-        $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
-        -Ljava \
-        -randroid.hidl:system/libhidl/transport \
-        -rvendor.nxp.hardware:vendor/nxp/interfaces/opensource \
-        vendor.nxp.hardware.nfc@1.0::INqNfc
-
-$(GEN): $(LOCAL_PATH)/INqNfc.hal
-	$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/1.0/default/Android.bp b/1.0/default/Android.bp
index bf88254..083dc08 100644
--- a/1.0/default/Android.bp
+++ b/1.0/default/Android.bp
@@ -11,7 +11,6 @@ cc_library_shared {
         "libhidlbase",
         "libhidltransport",
         "libutils",
-        "vendor.nxp.hardware.nfc@1.0_vendor",
-        "android.hidl.base@1.0",
+        "vendor.nxp.hardware.nfc@1.0",
     ],
 }
diff --git a/1.0/default/Android.mk b/1.0/default/Android.mk
index 74d5e84..6220ea9 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 \
+	vendor.nxp.hardware.nfc@1.0 \
 
 include $(BUILD_EXECUTABLE)