commit 6cf9db236209ae1560600274cad1414fc8b29eb9
author Iliyan Malchev <malchev@google.com> Mon Aug 08 09:56:14 2016 -0700
committer Iliyan Malchev <malchev@google.com> Mon Aug 08 09:56:20 2016 -0700
tree ce800983d47172684134863ce50638ef435e5756
parent a48313947e6e6eeaa87b01d795f0c7bc76373a09

fix build

Add hidl-gen as a dependency on HAL modules, and set the -r path
properly in the absence of $TOP being defined.

Proper fix will include auto-generating the makefile correctly form
hidl-gen.

Change-Id: I9dbe27b80c6c9ab4be9f88bf50496bdfd7cee423
Signed-off-by: Iliyan Malchev <malchev@google.com>

nfc/1.0/Android.mk

diff --git a/nfc/1.0/Android.mk b/nfc/1.0/Android.mk
index b38f927..17163c8 100644
--- a/nfc/1.0/Android.mk
+++ b/nfc/1.0/Android.mk
@@ -11,10 +11,12 @@
   $(intermediates)/android/hardware/nfc/1.0/NfcAll.cpp \
   $(intermediates)/android/hardware/nfc/1.0/NfcClientCallbackAll.cpp \
 
+$(GEN): hidl-gen
+
 $(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
 
 $(GEN): PRIVATE_CUSTOM_TOOL = \
-  hidl-gen -o $(PRIVATE_OUTPUT_DIR) android.hardware.nfc@1.0
+  hidl-gen -o $(PRIVATE_OUTPUT_DIR) -r android.hardware:hardware/interfaces android.hardware.nfc@1.0
 
 $(GEN): $(LOCAL_PATH)/types.hal $(LOCAL_PATH)/INfc.hal $(LOCAL_PATH)/INfcClientCallback.hal
 	$(transform-generated-source)