commit dbdafdb865e3e3d819a61542cc56e9224c8dcc04
author Ying Wang <wangying@google.com> Mon Jan 27 10:27:19 2014 -0800
committer Ying Wang <wangying@google.com> Mon Jan 27 10:27:19 2014 -0800
tree 59adbc351e54d8571c1f445148ac65d527d3d8d3
parent 7c7f28e71044ca04d368dec626faba37fe74818d

Support arch-specific LOCAL_C_INCLUDES.

Bug: 11654773
Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 3582ba0..4dad51a 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -94,7 +94,7 @@
 my_asflags := $(LOCAL_ASFLAGS) $(LOCAL_ASFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
 my_cc := $(LOCAL_CC)
 my_cxx := $(LOCAL_CXX)
-my_c_includes := $(LOCAL_C_INCLUDES)
+my_c_includes := $(LOCAL_C_INCLUDES) $(LOCAL_C_INCLUDES_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
 my_generated_sources := $(LOCAL_GENERATED_SOURCES)