commit 9aef18bc100bc9e4c1ce83be8b23b35882b0d5bf
author Keun Soo Yim <yim@google.com> Tue Jul 26 14:02:05 2016 -0700
committer Keun Soo Yim <yim@google.com> Tue Jul 26 14:07:43 2016 -0700
tree 10e90af7ffa449dce1d11f2eded1fea45e0d1dc8
parent 82c1006e0c6a6d1148179f34b864a4cdce2dd0b8

build fix for vts_arm64 target

Change-Id: I0ef7df2975809de0cfde0df78e85ce068168cbf9

hals/light/bullhead/Android.mk

diff --git a/hals/light/bullhead/Android.mk b/hals/light/bullhead/Android.mk
index 8a4568f..190ca9e 100644
--- a/hals/light/bullhead/Android.mk
+++ b/hals/light/bullhead/Android.mk
@@ -51,6 +51,8 @@
 
 LOCAL_COMPATIBILITY_SUITE := vts
 
+VTS_GCNO_MODULE := $(LOCAL_MODULE)
+
 include $(BUILD_SHARED_LIBRARY)
 include $(LOCAL_PATH)/../../../tools/build/Android.packaging_sharedlib.mk
 

tools/build/Android.packaging_gcno.mk

diff --git a/tools/build/Android.packaging_gcno.mk b/tools/build/Android.packaging_gcno.mk
index a270451..6e6d493 100644
--- a/tools/build/Android.packaging_gcno.mk
+++ b/tools/build/Android.packaging_gcno.mk
@@ -18,8 +18,9 @@
 
 vts_framework_lib_gcno_file := $(VTS_TESTCASES_OUT)/${LOCAL_MODULE}_${VTS_GCNO_FILE}.gcno
 
-$(vts_framework_lib_gcno_file): $(call intermediates-dir-for,SHARED_LIBRARIES,$(LOCAL_MODULE))/${VTS_GCNO_FILE}.gcno | $(ACP)
+$(vts_framework_lib_gcno_file): $(call intermediates-dir-for,SHARED_LIBRARIES,$(VTS_GCNO_MODULE))/${VTS_GCNO_FILE}.gcno | $(ACP)
 	$(hide) mkdir -p $(VTS_TESTCASES_OUT)
 	$(hide) $(ACP) -fp $< $@
 
 vts: $(vts_framework_lib_gcno_file)
+