From: Colin Cross <ccross@android.com>
Date: Sat, 31 Mar 2012 02:31:00 +0000 (-0700)
Subject: Remove base_intermediates from LOCAL_C_INCLUDES
X-Git-Tag: android-x86-4.4-r1~1180^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ad36ef9297a13097e62e3285bdc168060dae442;p=android-x86%2Fbuild.git

Remove base_intermediates from LOCAL_C_INCLUDES

base_intermediates is not used anywhere in the main build system,
and should not be part of LOCAL_C_INCLUDES.  It is used by
external/webkit/Android.mk as a local variable, which causes
the libwebcore_intermediates directory to be added to the include
path for every module.

Change-Id: Iddeee880add4b6f694a15d1900c588e1c547b9df
---

diff --git a/core/binary.mk b/core/binary.mk
index c5db242d7..f20a6a64a 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -518,7 +518,7 @@ all_objects := \
     $(proto_generated_objects) \
     $(addprefix $(TOPDIR)$(LOCAL_PATH)/,$(LOCAL_PREBUILT_OBJ_FILES))
 
-LOCAL_C_INCLUDES += $(TOPDIR)$(LOCAL_PATH) $(intermediates) $(base_intermediates)
+LOCAL_C_INCLUDES += $(TOPDIR)$(LOCAL_PATH) $(intermediates)
 
 ifndef LOCAL_NDK_VERSION
   LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)