Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I3187cbab152cab17a27a583158cb02b616bd3211
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index 8d255ba..f33f23b 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -131,6 +131,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 \
@@ -238,6 +239,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 \
diff --git a/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index 6fa19db..c95c4b3 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -121,6 +121,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 \
@@ -217,6 +218,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 \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index ec3cadb..637ab01 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-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 \
diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index eb12e03..80722db 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.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 \
@@ -227,6 +228,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 \
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index ad70fa1..26a549b 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -125,6 +125,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 \
@@ -225,6 +226,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 \
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index 8d255ba..f33f23b 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -131,6 +131,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 \
@@ -238,6 +239,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 \
diff --git a/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index 6fa19db..c95c4b3 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -121,6 +121,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 \
@@ -217,6 +218,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 \
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 \
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index eb12e03..80722db 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.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 \
@@ -227,6 +228,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 \
diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index ad70fa1..26a549b 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -125,6 +125,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 \
@@ -225,6 +226,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 \