diff options
author | Yifan Hong <elsk@google.com> | 2016-12-13 22:20:16 +0000 |
---|---|---|
committer | Yifan Hong <elsk@google.com> | 2016-12-13 22:20:16 +0000 |
commit | f35ee3b192f76583f7ccb170d7f1dab36cf9e06c (patch) | |
tree | 34a0606cd60de072e360256ff7bb6022b721c72f /nfc/1.0/Android.mk | |
parent | a8789f27cb89496675483b83c76f271474085d62 (diff) | |
download | platform_hardware_interfaces-f35ee3b192f76583f7ccb170d7f1dab36cf9e06c.tar.gz platform_hardware_interfaces-f35ee3b192f76583f7ccb170d7f1dab36cf9e06c.tar.bz2 platform_hardware_interfaces-f35ee3b192f76583f7ccb170d7f1dab36cf9e06c.zip |
Revert "Revert "Update makefiles for Java package path.""
This reverts commit a8789f27cb89496675483b83c76f271474085d62.
Change-Id: I69980b580a556188ba868bb096ae1590b01759f5
Diffstat (limited to 'nfc/1.0/Android.mk')
-rw-r--r-- | nfc/1.0/Android.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk index f534944e43..823bde5277 100644 --- a/nfc/1.0/Android.mk +++ b/nfc/1.0/Android.mk @@ -19,7 +19,7 @@ LOCAL_JAVA_LIBRARIES := \ # # Build types.hal (NfcEvent) # -GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -38,7 +38,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NfcStatus) # -GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -57,7 +57,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build INfc.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal @@ -80,7 +80,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build INfcClientCallback.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal @@ -117,7 +117,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ # # Build types.hal (NfcEvent) # -GEN := $(intermediates)/android/hardware/nfc/1.0/NfcEvent.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcEvent.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -136,7 +136,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build types.hal (NfcStatus) # -GEN := $(intermediates)/android/hardware/nfc/1.0/NfcStatus.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/NfcStatus.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal @@ -155,7 +155,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build INfc.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/INfc.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/INfc.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfc.hal @@ -178,7 +178,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # # Build INfcClientCallback.hal # -GEN := $(intermediates)/android/hardware/nfc/1.0/INfcClientCallback.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/INfcClientCallback.java $(GEN): $(HIDL) $(GEN): PRIVATE_HIDL := $(HIDL) $(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/INfcClientCallback.hal @@ -208,7 +208,7 @@ intermediates := $(local-generated-sources-dir) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # -GEN := $(intermediates)/android/hardware/nfc/1.0/Constants.java +GEN := $(intermediates)/android/hardware/nfc/V1_0/Constants.java $(GEN): $(HIDL) $(GEN): $(LOCAL_PATH)/types.hal $(GEN): $(LOCAL_PATH)/INfc.hal |