From dbdafdb865e3e3d819a61542cc56e9224c8dcc04 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 27 Jan 2014 10:27:19 -0800
Subject: [PATCH] Support arch-specific LOCAL_C_INCLUDES.

Bug: 11654773
Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422
---
 core/binary.mk     | 2 +-
 core/clear_vars.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/binary.mk b/core/binary.mk
index 3582ba06a..4dad51ae8 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -94,7 +94,7 @@ my_ldflags := $(LOCAL_LDFLAGS) $(LOCAL_LDFLAGS_$(TARGET_$(LOCAL_2ND_ARCH_VAR_PRE
 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)
 
 
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 42ce74237..56e17b0a3 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -148,12 +148,14 @@ LOCAL_NO_2ND_ARCH:= # '',true
 # arch specific variables
 LOCAL_SRC_FILES_$(TARGET_ARCH):=
 LOCAL_CFLAGS_$(TARGET_ARCH):=
+LOCAL_C_INCLUDES_$(TARGET_ARCH):=
 LOCAL_ASFLAGS_$(TARGET_ARCH):=
 LOCAL_NO_CRT_$(TARGET_ARCH):=
 LOCAL_LDFLAGS_$(TARGET_ARCH):=
 ifdef TARGET_2ND_ARCH
 LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):=
 LOCAL_CFLAGS_$(TARGET_2ND_ARCH):=
+LOCAL_C_INCLUDES_$(TARGET_2ND_ARCH):=
 LOCAL_ASFLAGS_$(TARGET_2ND_ARCH):=
 LOCAL_NO_CRT_$(TARGET_2ND_ARCH):=
 LOCAL_LDFLAGS_$(TARGET_2ND_ARCH):=