diff options
| author | Iliyan Malchev <malchev@google.com> | 2016-09-07 12:45:02 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2016-09-07 14:37:35 -0700 |
| commit | b350caf9dc61882d30a55d929ca6817c4e5a30d2 (patch) | |
| tree | a1ffdafc671544b8c7d27093bfe245a154dc6ff8 /nfc/1.0/Android.mk | |
| parent | c0ba83e30a2082c65447544be6cff7d5df9e3a44 (diff) | |
| download | platform_hardware_interfaces-b350caf9dc61882d30a55d929ca6817c4e5a30d2.tar.gz platform_hardware_interfaces-b350caf9dc61882d30a55d929ca6817c4e5a30d2.tar.bz2 platform_hardware_interfaces-b350caf9dc61882d30a55d929ca6817c4e5a30d2.zip | |
interfaces: update makefiles
b/31015466
b/31045569
Change-Id: I07d54fd956fedc4b94622ace1c8f2be3f2f93b2b
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'nfc/1.0/Android.mk')
| -rw-r--r-- | nfc/1.0/Android.mk | 88 |
1 files changed, 50 insertions, 38 deletions
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index ee8000b0df..12af4b50a6 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -9,53 +9,59 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # -# Build INfc.hal +# Build types.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/NfcAll.cpp +GEN := $(intermediates)/android/hardware/nfc/1.0/types.cpp $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfc + android.hardware.nfc@1.0::types -$(GEN): $(LOCAL_PATH)/INfc.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build INfcClientCallback.hal +# Build INfc.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/NfcClientCallbackAll.cpp +GEN := $(intermediates)/android/hardware/nfc/1.0/NfcAll.cpp $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal +$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/INfcClientCallback.hal +$(GEN): $(LOCAL_PATH)/INfcClientCallback.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) \ -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfcClientCallback + android.hardware.nfc@1.0::INfc -$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal +$(GEN): $(LOCAL_PATH)/INfc.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal +# Build INfcClientCallback.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/types.cpp +GEN := $(intermediates)/android/hardware/nfc/1.0/NfcClientCallbackAll.cpp $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.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) \ -Lc++ -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types + android.hardware.nfc@1.0::INfcClientCallback -$(GEN): $(LOCAL_PATH)/types.hal +$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) @@ -79,43 +85,43 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # -# Build INfc.hal +# Build types.hal (nfc_data_t) # -GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java +GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfc + android.hardware.nfc@1.0::types.nfc_data_t -$(GEN): $(LOCAL_PATH)/INfc.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build INfcClientCallback.hal +# Build types.hal (nfc_event_t) # -GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java +GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::INfcClientCallback + android.hardware.nfc@1.0::types.nfc_event_t -$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal +$(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (nfc_data_t) +# Build types.hal (nfc_status_t) # -GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_data_t.java +GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -123,43 +129,49 @@ $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) $(GEN): PRIVATE_CUSTOM_TOOL = \ $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ -Ljava -randroid.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_data_t + android.hardware.nfc@1.0::types.nfc_status_t $(GEN): $(LOCAL_PATH)/types.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (nfc_event_t) +# Build INfc.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_event_t.java +GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal +$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/INfcClientCallback.hal +$(GEN): $(LOCAL_PATH)/INfcClientCallback.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.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_event_t + android.hardware.nfc@1.0::INfc -$(GEN): $(LOCAL_PATH)/types.hal +$(GEN): $(LOCAL_PATH)/INfc.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) # -# Build types.hal (nfc_status_t) +# Build INfcClientCallback.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/nfc_status_t.java +GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) -$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.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.hardware:hardware/interfaces \ - android.hardware.nfc@1.0::types.nfc_status_t + android.hardware.nfc@1.0::INfcClientCallback -$(GEN): $(LOCAL_PATH)/types.hal +$(GEN): $(LOCAL_PATH)/INfcClientCallback.hal $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) include $(BUILD_JAVA_LIBRARY) |