commit 3dc2a3cd8d98274cf0a76e566edc2a578ca0ba2d
author Android Chromium Automerger <chromium-automerger@android> Mon Jun 16 14:50:37 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Mon Jun 16 14:50:37 2014 +0000
tree 6deeec2f3afac3a8683f0eedc48f15a74853678c
parent c9d3664bc736891d70e179d1fd79c5778179751e

Update makefiles after merge of Chromium at 277428

This commit was generated by merge_from_chromium.py.

Change-Id: I3187cbab152cab17a27a583158cb02b616bd3211

ft2.target.linux-mips.mk

diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index ec3cadb..637ab01 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -126,6 +126,7 @@
 
 # Include paths placed before CFLAGS/CPPFLAGS
 LOCAL_C_INCLUDES_Debug := \
+	$(gyp_shared_intermediate_dir) \
 	$(LOCAL_PATH)/third_party/freetype/build \
 	$(LOCAL_PATH)/third_party/freetype/include \
 	$(LOCAL_PATH)/third_party/libpng \
@@ -228,6 +229,7 @@
 
 # Include paths placed before CFLAGS/CPPFLAGS
 LOCAL_C_INCLUDES_Release := \
+	$(gyp_shared_intermediate_dir) \
 	$(LOCAL_PATH)/third_party/freetype/build \
 	$(LOCAL_PATH)/third_party/freetype/include \
 	$(LOCAL_PATH)/third_party/libpng \