aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:40 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-16 14:50:40 +0000
commitdbfa6f176cf1231315829678beadfe1ec7028d4c (patch)
tree21060e61f18b9a00b65c8bf4509d3cf11199e6ce
parent1f5f390d0bfbada791a3bbb7010ad4370cb0d0ad (diff)
downloadots-dbfa6f176cf1231315829678beadfe1ec7028d4c.tar.gz
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py. Change-Id: I9fc6dd2196dab1c98683554d2cb7c97e4aa35260
Diffstat
-rw-r--r--ots.target.darwin-arm.mk2
-rw-r--r--ots.target.darwin-arm64.mk2
-rw-r--r--ots.target.darwin-mips.mk2
-rw-r--r--ots.target.darwin-x86.mk2
-rw-r--r--ots.target.darwin-x86_64.mk2
-rw-r--r--ots.target.linux-arm.mk2
-rw-r--r--ots.target.linux-arm64.mk2
-rw-r--r--ots.target.linux-mips.mk2
-rw-r--r--ots.target.linux-x86.mk2
-rw-r--r--ots.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index b1231d5..79ff91b 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -137,6 +137,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -237,6 +238,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index a89a674..8d4ef26 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -127,6 +127,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -216,6 +217,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 8392f03..f85274f 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -131,6 +131,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -225,6 +226,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index 092c9b9..84ca781 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -132,6 +132,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -226,6 +227,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index d3f3e55..30d1ac9 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -131,6 +131,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -224,6 +225,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index b1231d5..79ff91b 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -137,6 +137,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -237,6 +238,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index a89a674..8d4ef26 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -127,6 +127,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -216,6 +217,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 8392f03..f85274f 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -131,6 +131,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -225,6 +226,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 092c9b9..84ca781 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -132,6 +132,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -226,6 +227,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index d3f3e55..30d1ac9 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -131,6 +131,7 @@ MY_DEFS_Debug := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -224,6 +225,7 @@ MY_DEFS_Release := \
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 21:26:20 +0000