commit 1aa29599c6570281b3f89f117c4b994e056b48af
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 12 20:49:12 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 12 20:49:12 2017 +0000
tree fb56ca5f5d733e9d209db2525877383d33309d2a
parent 95a8c7e83f545f549de1b79b33a2c480a5b28619
parent cb8e636ed0104d4649e3c8c0822358651a8c6e6b

Merge "fix: device_kernel_headers can't be found in the make world"

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 502f79e..10ce130 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -1375,7 +1375,7 @@
 import_includes := $(intermediates)/import_includes
 import_includes_deps := $(strip \
     $(if $(LOCAL_USE_VNDK),\
-      $(call intermediates-dir-for,HEADER_LIBRARIES,device_kernel_headers,$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes) \
+      $(call intermediates-dir-for,HEADER_LIBRARIES,device_kernel_headers.vendor,$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes) \
     $(foreach l, $(installed_shared_library_module_names), \
       $(call intermediates-dir-for,SHARED_LIBRARIES,$(l),$(my_kind),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes) \
     $(foreach l, $(my_static_libraries) $(my_whole_static_libraries), \