summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:37 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:37 +0000
commit3dc2a3cd8d98274cf0a76e566edc2a578ca0ba2d (patch)
tree6deeec2f3afac3a8683f0eedc48f15a74853678c
parentc9d3664bc736891d70e179d1fd79c5778179751e (diff)
downloadfreetype-3dc2a3cd8d98274cf0a76e566edc2a578ca0ba2d.tar.gz
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py. Change-Id: I3187cbab152cab17a27a583158cb02b616bd3211
Diffstat
-rw-r--r--ft2.target.darwin-arm.mk2
-rw-r--r--ft2.target.darwin-arm64.mk2
-rw-r--r--ft2.target.darwin-mips.mk2
-rw-r--r--ft2.target.darwin-x86.mk2
-rw-r--r--ft2.target.darwin-x86_64.mk2
-rw-r--r--ft2.target.linux-arm.mk2
-rw-r--r--ft2.target.linux-arm64.mk2
-rw-r--r--ft2.target.linux-mips.mk2
-rw-r--r--ft2.target.linux-x86.mk2
-rw-r--r--ft2.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 @@ MY_DEFS_Debug := \
# 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 @@ MY_DEFS_Release := \
# 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 \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 11:47:59 +0000