diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-25 10:06:34 +0100 |
| commit | bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 (patch) | |
| tree | 51387d1614b16fcf107004649d44707d271da339 /third_party | |
| parent | 8a142c18176c4e279012cb218f060cfc3df087c5 (diff) | |
| download | chromium_org-bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3.tar.gz | |
Merge from Chromium at DEPS revision r213605
This commit was generated by merge_to_master.py.
Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
Diffstat (limited to 'third_party')
64 files changed, 241 insertions, 207 deletions
diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-arm.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-arm.mk index 2e745b83b1..c8d4f2cdfe 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-arm.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-arm.mk @@ -119,8 +119,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -207,8 +207,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk index 60f52b5bc6..53b4c7f474 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk @@ -119,8 +119,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -207,8 +207,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-x86.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-x86.mk index 87fc840118..256ef52e99 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-x86.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-x86.mk @@ -121,8 +121,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -212,8 +212,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-arm.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-arm.mk index 2e745b83b1..c8d4f2cdfe 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-arm.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-arm.mk @@ -119,8 +119,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -207,8 +207,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk index 60f52b5bc6..53b4c7f474 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk @@ -119,8 +119,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -207,8 +207,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-x86.mk b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-x86.mk index 87fc840118..256ef52e99 100644 --- a/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-x86.mk +++ b/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-x86.mk @@ -121,8 +121,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -212,8 +212,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/harfbuzz-ng/src \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/leveldatabase/chromium_logger.h b/third_party/leveldatabase/chromium_logger.h index 3595d2b1a5..76862c35ff 100644 --- a/third_party/leveldatabase/chromium_logger.h +++ b/third_party/leveldatabase/chromium_logger.h @@ -44,7 +44,7 @@ class ChromiumLogger : public Logger { ::base::Time::Now().LocalExplode(&t); p += ::base::snprintf(p, limit - p, - "%04d/%02d/%02d-%02d:%02d:%02d.%03d %"PRIu64" ", + "%04d/%02d/%02d-%02d:%02d:%02d.%03d %" PRIu64 " ", t.year, t.month, t.day_of_month, diff --git a/third_party/leveldatabase/leveldatabase.target.darwin-arm.mk b/third_party/leveldatabase/leveldatabase.target.darwin-arm.mk index ae4f9fa042..4aa3be9255 100644 --- a/third_party/leveldatabase/leveldatabase.target.darwin-arm.mk +++ b/third_party/leveldatabase/leveldatabase.target.darwin-arm.mk @@ -125,10 +125,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ @@ -212,10 +212,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk b/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk index 4a3edc1404..27458668f8 100644 --- a/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk +++ b/third_party/leveldatabase/leveldatabase.target.darwin-mips.mk @@ -125,10 +125,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ @@ -212,10 +212,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/leveldatabase/leveldatabase.target.darwin-x86.mk b/third_party/leveldatabase/leveldatabase.target.darwin-x86.mk index 47673f8340..7f7bf0fdcd 100644 --- a/third_party/leveldatabase/leveldatabase.target.darwin-x86.mk +++ b/third_party/leveldatabase/leveldatabase.target.darwin-x86.mk @@ -127,10 +127,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ @@ -217,10 +217,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/leveldatabase/leveldatabase.target.linux-arm.mk b/third_party/leveldatabase/leveldatabase.target.linux-arm.mk index ae4f9fa042..4aa3be9255 100644 --- a/third_party/leveldatabase/leveldatabase.target.linux-arm.mk +++ b/third_party/leveldatabase/leveldatabase.target.linux-arm.mk @@ -125,10 +125,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ @@ -212,10 +212,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/leveldatabase/leveldatabase.target.linux-mips.mk b/third_party/leveldatabase/leveldatabase.target.linux-mips.mk index 4a3edc1404..27458668f8 100644 --- a/third_party/leveldatabase/leveldatabase.target.linux-mips.mk +++ b/third_party/leveldatabase/leveldatabase.target.linux-mips.mk @@ -125,10 +125,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ @@ -212,10 +212,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/leveldatabase/leveldatabase.target.linux-x86.mk b/third_party/leveldatabase/leveldatabase.target.linux-x86.mk index 47673f8340..7f7bf0fdcd 100644 --- a/third_party/leveldatabase/leveldatabase.target.linux-x86.mk +++ b/third_party/leveldatabase/leveldatabase.target.linux-x86.mk @@ -127,10 +127,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ @@ -217,10 +217,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/leveldatabase \ $(LOCAL_PATH)/third_party/leveldatabase/src \ $(LOCAL_PATH)/third_party/leveldatabase/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/re2 \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/libjingle/libjingle.target.darwin-arm.mk b/third_party/libjingle/libjingle.target.darwin-arm.mk index 05a0ee7ccb..93505cf4bb 100644 --- a/third_party/libjingle/libjingle.target.darwin-arm.mk +++ b/third_party/libjingle/libjingle.target.darwin-arm.mk @@ -222,6 +222,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -229,9 +232,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -333,6 +333,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -340,9 +343,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle.target.darwin-mips.mk b/third_party/libjingle/libjingle.target.darwin-mips.mk index 9dee31a0ff..425899f7f1 100644 --- a/third_party/libjingle/libjingle.target.darwin-mips.mk +++ b/third_party/libjingle/libjingle.target.darwin-mips.mk @@ -222,6 +222,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -229,9 +232,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -333,6 +333,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -340,9 +343,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle.target.darwin-x86.mk b/third_party/libjingle/libjingle.target.darwin-x86.mk index a5702d9057..5b0762b633 100644 --- a/third_party/libjingle/libjingle.target.darwin-x86.mk +++ b/third_party/libjingle/libjingle.target.darwin-x86.mk @@ -223,6 +223,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -230,9 +233,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -336,6 +336,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -343,9 +346,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle.target.linux-arm.mk b/third_party/libjingle/libjingle.target.linux-arm.mk index 05a0ee7ccb..93505cf4bb 100644 --- a/third_party/libjingle/libjingle.target.linux-arm.mk +++ b/third_party/libjingle/libjingle.target.linux-arm.mk @@ -222,6 +222,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -229,9 +232,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -333,6 +333,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -340,9 +343,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle.target.linux-mips.mk b/third_party/libjingle/libjingle.target.linux-mips.mk index 9dee31a0ff..425899f7f1 100644 --- a/third_party/libjingle/libjingle.target.linux-mips.mk +++ b/third_party/libjingle/libjingle.target.linux-mips.mk @@ -222,6 +222,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -229,9 +232,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -333,6 +333,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -340,9 +343,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle.target.linux-x86.mk b/third_party/libjingle/libjingle.target.linux-x86.mk index a5702d9057..5b0762b633 100644 --- a/third_party/libjingle/libjingle.target.linux-x86.mk +++ b/third_party/libjingle/libjingle.target.linux-x86.mk @@ -223,6 +223,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -230,9 +233,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -336,6 +336,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -343,9 +346,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.darwin-arm.mk b/third_party/libjingle/libjingle_p2p_constants.target.darwin-arm.mk index 9dc35992ee..60c520d1c4 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.darwin-arm.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.darwin-arm.mk @@ -106,6 +106,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -113,9 +116,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -216,6 +216,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -223,9 +226,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk b/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk index 22ec86a91e..058d25440d 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.darwin-mips.mk @@ -106,6 +106,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -113,9 +116,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -216,6 +216,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -223,9 +226,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.darwin-x86.mk b/third_party/libjingle/libjingle_p2p_constants.target.darwin-x86.mk index bebfda84c3..ca765b2801 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.darwin-x86.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.darwin-x86.mk @@ -107,6 +107,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -114,9 +117,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -219,6 +219,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -226,9 +229,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.linux-arm.mk b/third_party/libjingle/libjingle_p2p_constants.target.linux-arm.mk index 9dc35992ee..60c520d1c4 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.linux-arm.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.linux-arm.mk @@ -106,6 +106,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -113,9 +116,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -216,6 +216,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -223,9 +226,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk b/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk index 22ec86a91e..058d25440d 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.linux-mips.mk @@ -106,6 +106,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -113,9 +116,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -216,6 +216,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -223,9 +226,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libjingle/libjingle_p2p_constants.target.linux-x86.mk b/third_party/libjingle/libjingle_p2p_constants.target.linux-x86.mk index bebfda84c3..ca765b2801 100644 --- a/third_party/libjingle/libjingle_p2p_constants.target.linux-x86.mk +++ b/third_party/libjingle/libjingle_p2p_constants.target.linux-x86.mk @@ -107,6 +107,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -114,9 +117,6 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ @@ -219,6 +219,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ @@ -226,9 +229,6 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/usrsctp \ $(LOCAL_PATH)/third_party/webrtc \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ $(PWD)/external/expat/lib \ $(LOCAL_PATH)/third_party/openssl/openssl/include \ diff --git a/third_party/libphonenumber/libphonenumber.target.darwin-arm.mk b/third_party/libphonenumber/libphonenumber.target.darwin-arm.mk index cc12f05c53..baeb801b0d 100644 --- a/third_party/libphonenumber/libphonenumber.target.darwin-arm.mk +++ b/third_party/libphonenumber/libphonenumber.target.darwin-arm.mk @@ -93,11 +93,11 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ @@ -186,11 +186,11 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk b/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk index cbc02699cc..a2ba599a50 100644 --- a/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk +++ b/third_party/libphonenumber/libphonenumber.target.darwin-mips.mk @@ -93,11 +93,11 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ @@ -186,11 +186,11 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber.target.darwin-x86.mk b/third_party/libphonenumber/libphonenumber.target.darwin-x86.mk index 7892047749..6863fa14db 100644 --- a/third_party/libphonenumber/libphonenumber.target.darwin-x86.mk +++ b/third_party/libphonenumber/libphonenumber.target.darwin-x86.mk @@ -95,11 +95,11 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ @@ -191,11 +191,11 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber.target.linux-arm.mk b/third_party/libphonenumber/libphonenumber.target.linux-arm.mk index cc12f05c53..baeb801b0d 100644 --- a/third_party/libphonenumber/libphonenumber.target.linux-arm.mk +++ b/third_party/libphonenumber/libphonenumber.target.linux-arm.mk @@ -93,11 +93,11 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ @@ -186,11 +186,11 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber.target.linux-mips.mk b/third_party/libphonenumber/libphonenumber.target.linux-mips.mk index cbc02699cc..a2ba599a50 100644 --- a/third_party/libphonenumber/libphonenumber.target.linux-mips.mk +++ b/third_party/libphonenumber/libphonenumber.target.linux-mips.mk @@ -93,11 +93,11 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ @@ -186,11 +186,11 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber.target.linux-x86.mk b/third_party/libphonenumber/libphonenumber.target.linux-x86.mk index 7892047749..6863fa14db 100644 --- a/third_party/libphonenumber/libphonenumber.target.linux-x86.mk +++ b/third_party/libphonenumber/libphonenumber.target.linux-x86.mk @@ -95,11 +95,11 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ @@ -191,11 +191,11 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-arm.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-arm.mk index 2fbd3a9a96..1bb0e09215 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-arm.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-arm.mk @@ -158,13 +158,13 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ @@ -254,13 +254,13 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk index c0435442ac..8dea3b7f83 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-mips.mk @@ -158,13 +158,13 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ @@ -254,13 +254,13 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-x86.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-x86.mk index 4df2595c47..ee9217ea5c 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-x86.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.darwin-x86.mk @@ -160,13 +160,13 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ @@ -259,13 +259,13 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-arm.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-arm.mk index 2fbd3a9a96..1bb0e09215 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-arm.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-arm.mk @@ -158,13 +158,13 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ @@ -254,13 +254,13 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk index c0435442ac..8dea3b7f83 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-mips.mk @@ -158,13 +158,13 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ @@ -254,13 +254,13 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-x86.mk b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-x86.mk index 4df2595c47..ee9217ea5c 100644 --- a/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-x86.mk +++ b/third_party/libphonenumber/libphonenumber_without_metadata.target.linux-x86.mk @@ -160,13 +160,13 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ @@ -259,13 +259,13 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/libphonenumber/src \ $(LOCAL_PATH)/third_party/libphonenumber/src/test \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(gyp_shared_intermediate_dir)/protoc_out \ $(LOCAL_PATH) \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/protobuf \ diff --git a/third_party/libxml/libxml.target.darwin-arm.mk b/third_party/libxml/libxml.target.darwin-arm.mk index 3029ed590a..c429465d17 100644 --- a/third_party/libxml/libxml.target.darwin-arm.mk +++ b/third_party/libxml/libxml.target.darwin-arm.mk @@ -135,10 +135,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ @@ -225,10 +225,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ diff --git a/third_party/libxml/libxml.target.darwin-mips.mk b/third_party/libxml/libxml.target.darwin-mips.mk index c2910350a4..64addc1ebc 100644 --- a/third_party/libxml/libxml.target.darwin-mips.mk +++ b/third_party/libxml/libxml.target.darwin-mips.mk @@ -135,10 +135,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ @@ -225,10 +225,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ diff --git a/third_party/libxml/libxml.target.darwin-x86.mk b/third_party/libxml/libxml.target.darwin-x86.mk index 731ac1d0ba..1bf87746bd 100644 --- a/third_party/libxml/libxml.target.darwin-x86.mk +++ b/third_party/libxml/libxml.target.darwin-x86.mk @@ -137,10 +137,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ @@ -230,10 +230,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ diff --git a/third_party/libxml/libxml.target.linux-arm.mk b/third_party/libxml/libxml.target.linux-arm.mk index 3029ed590a..c429465d17 100644 --- a/third_party/libxml/libxml.target.linux-arm.mk +++ b/third_party/libxml/libxml.target.linux-arm.mk @@ -135,10 +135,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ @@ -225,10 +225,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ diff --git a/third_party/libxml/libxml.target.linux-mips.mk b/third_party/libxml/libxml.target.linux-mips.mk index c2910350a4..64addc1ebc 100644 --- a/third_party/libxml/libxml.target.linux-mips.mk +++ b/third_party/libxml/libxml.target.linux-mips.mk @@ -135,10 +135,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ @@ -225,10 +225,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ diff --git a/third_party/libxml/libxml.target.linux-x86.mk b/third_party/libxml/libxml.target.linux-x86.mk index 731ac1d0ba..1bf87746bd 100644 --- a/third_party/libxml/libxml.target.linux-x86.mk +++ b/third_party/libxml/libxml.target.linux-x86.mk @@ -137,10 +137,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ @@ -230,10 +230,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(LOCAL_PATH)/third_party/zlib \ diff --git a/third_party/libxslt/libxslt.target.darwin-arm.mk b/third_party/libxslt/libxslt.target.darwin-arm.mk index e3a302426a..290b30d19d 100644 --- a/third_party/libxslt/libxslt.target.darwin-arm.mk +++ b/third_party/libxslt/libxslt.target.darwin-arm.mk @@ -108,9 +108,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ @@ -198,9 +198,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ diff --git a/third_party/libxslt/libxslt.target.darwin-mips.mk b/third_party/libxslt/libxslt.target.darwin-mips.mk index 8e63969b17..48d60a8391 100644 --- a/third_party/libxslt/libxslt.target.darwin-mips.mk +++ b/third_party/libxslt/libxslt.target.darwin-mips.mk @@ -108,9 +108,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ @@ -198,9 +198,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ diff --git a/third_party/libxslt/libxslt.target.darwin-x86.mk b/third_party/libxslt/libxslt.target.darwin-x86.mk index ff80f8d0da..4048dbe509 100644 --- a/third_party/libxslt/libxslt.target.darwin-x86.mk +++ b/third_party/libxslt/libxslt.target.darwin-x86.mk @@ -110,9 +110,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ @@ -203,9 +203,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ diff --git a/third_party/libxslt/libxslt.target.linux-arm.mk b/third_party/libxslt/libxslt.target.linux-arm.mk index e3a302426a..290b30d19d 100644 --- a/third_party/libxslt/libxslt.target.linux-arm.mk +++ b/third_party/libxslt/libxslt.target.linux-arm.mk @@ -108,9 +108,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ @@ -198,9 +198,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ diff --git a/third_party/libxslt/libxslt.target.linux-mips.mk b/third_party/libxslt/libxslt.target.linux-mips.mk index 8e63969b17..48d60a8391 100644 --- a/third_party/libxslt/libxslt.target.linux-mips.mk +++ b/third_party/libxslt/libxslt.target.linux-mips.mk @@ -108,9 +108,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ @@ -198,9 +198,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ diff --git a/third_party/libxslt/libxslt.target.linux-x86.mk b/third_party/libxslt/libxslt.target.linux-x86.mk index ff80f8d0da..4048dbe509 100644 --- a/third_party/libxslt/libxslt.target.linux-x86.mk +++ b/third_party/libxslt/libxslt.target.linux-x86.mk @@ -110,9 +110,9 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ @@ -203,9 +203,9 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxslt/linux \ $(LOCAL_PATH)/third_party/libxslt \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH)/third_party/libxml/linux/include \ $(LOCAL_PATH)/third_party/libxml/src/include \ $(PWD)/external/icu4c/common \ diff --git a/third_party/sqlite/sqlite.target.darwin-arm.mk b/third_party/sqlite/sqlite.target.darwin-arm.mk index a2ae57c18f..4a396855c9 100644 --- a/third_party/sqlite/sqlite.target.darwin-arm.mk +++ b/third_party/sqlite/sqlite.target.darwin-arm.mk @@ -112,10 +112,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -215,10 +215,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/sqlite/sqlite.target.darwin-mips.mk b/third_party/sqlite/sqlite.target.darwin-mips.mk index ea967f85ec..b123ac58d5 100644 --- a/third_party/sqlite/sqlite.target.darwin-mips.mk +++ b/third_party/sqlite/sqlite.target.darwin-mips.mk @@ -112,10 +112,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -215,10 +215,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/sqlite/sqlite.target.darwin-x86.mk b/third_party/sqlite/sqlite.target.darwin-x86.mk index e65d1d09d0..0660cc1031 100644 --- a/third_party/sqlite/sqlite.target.darwin-x86.mk +++ b/third_party/sqlite/sqlite.target.darwin-x86.mk @@ -114,10 +114,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -220,10 +220,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/sqlite/sqlite.target.linux-arm.mk b/third_party/sqlite/sqlite.target.linux-arm.mk index a2ae57c18f..4a396855c9 100644 --- a/third_party/sqlite/sqlite.target.linux-arm.mk +++ b/third_party/sqlite/sqlite.target.linux-arm.mk @@ -112,10 +112,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -215,10 +215,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/sqlite/sqlite.target.linux-mips.mk b/third_party/sqlite/sqlite.target.linux-mips.mk index ea967f85ec..b123ac58d5 100644 --- a/third_party/sqlite/sqlite.target.linux-mips.mk +++ b/third_party/sqlite/sqlite.target.linux-mips.mk @@ -112,10 +112,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -215,10 +215,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/sqlite/sqlite.target.linux-x86.mk b/third_party/sqlite/sqlite.target.linux-x86.mk index e65d1d09d0..0660cc1031 100644 --- a/third_party/sqlite/sqlite.target.linux-x86.mk +++ b/third_party/sqlite/sqlite.target.linux-x86.mk @@ -114,10 +114,10 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ @@ -220,10 +220,10 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/third_party/sqlite/amalgamation \ $(LOCAL_PATH)/third_party/sqlite/src/src \ - $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ $(PWD)/frameworks/wilhelm/include \ diff --git a/third_party/tcmalloc/README.chromium b/third_party/tcmalloc/README.chromium index 9da19cad7c..0682e8d30b 100644 --- a/third_party/tcmalloc/README.chromium +++ b/third_party/tcmalloc/README.chromium @@ -89,3 +89,5 @@ Modifications: - Added support for android. - Use NULL instead of static_cast<uintptr_t>(0) in stack_trace_table.cc, for -std=c++11 compatibility. +- Added support for pseudo-stack heap profiling via a callback to retrieve a + simulated stack from the embedding application. diff --git a/third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h b/third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h index 8e3ee962c7..c2f16997aa 100644 --- a/third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h +++ b/third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h @@ -68,9 +68,24 @@ extern "C" { /* Start profiling and arrange to write profile data to file names * of the form: "prefix.0000", "prefix.0001", ... + * + * If |prefix| is NULL then dumps will not be written to disk. Applications + * can use GetHeapProfile() to get profile data, but HeapProfilerDump() will do + * nothing. */ PERFTOOLS_DLL_DECL void HeapProfilerStart(const char* prefix); +/* Start profiling with a callback function that returns application-generated + * stacks. Profiles are not written to disk, but may be obtained via + * GetHeapProfile(). The callback: + * 1. May optionally skip the first |skip_count| items on the stack. + * 2. Must provide a |stack| buffer of at least size 32 * sizeof(void*). + * 3. Must return the number of items copied or zero. + */ +typedef int (*StackGeneratorFunction)(int skip_count, void** stack); +PERFTOOLS_DLL_DECL void HeapProfilerWithPseudoStackStart( + StackGeneratorFunction callback); + /* Returns non-zero if we are currently profiling the heap. (Returns * an int rather than a bool so it's usable from C.) This is true * between calls to HeapProfilerStart() and HeapProfilerStop(), and diff --git a/third_party/tcmalloc/chromium/src/heap-profiler.cc b/third_party/tcmalloc/chromium/src/heap-profiler.cc index eb993a50d5..8d7bc42d81 100644 --- a/third_party/tcmalloc/chromium/src/heap-profiler.cc +++ b/third_party/tcmalloc/chromium/src/heap-profiler.cc @@ -222,6 +222,11 @@ static int64 last_dump_time = 0; // The time of the last dump static HeapProfileTable* heap_profile = NULL; // the heap profile table static DeepHeapProfile* deep_profile = NULL; // deep memory profiler +// Callback to generate a stack trace for an allocation. May be overriden +// by an application to provide its own pseudo-stacks. +static StackGeneratorFunction stack_generator_function = + HeapProfileTable::GetCallerStackTrace; + //---------------------------------------------------------------------- // Profile generation //---------------------------------------------------------------------- @@ -374,7 +379,7 @@ static void MaybeDumpProfileLocked() { static void RecordAlloc(const void* ptr, size_t bytes, int skip_count) { // Take the stack trace outside the critical section. void* stack[HeapProfileTable::kMaxStackDepth]; - int depth = HeapProfileTable::GetCallerStackTrace(skip_count + 1, stack); + int depth = stack_generator_function(skip_count + 1, stack); SpinLockHolder l(&heap_lock); if (is_on) { heap_profile->RecordAlloc(ptr, bytes, depth, stack); @@ -542,7 +547,9 @@ extern "C" void HeapProfilerStart(const char* prefix) { RAW_CHECK(MallocHook::AddDeleteHook(&DeleteHook), ""); } - // Copy filename prefix + // Copy filename prefix only if provided. + if (!prefix) + return; RAW_DCHECK(filename_prefix == NULL, ""); const int prefix_length = strlen(prefix); filename_prefix = reinterpret_cast<char*>(ProfilerMalloc(prefix_length + 1)); @@ -550,6 +557,16 @@ extern "C" void HeapProfilerStart(const char* prefix) { filename_prefix[prefix_length] = '\0'; } +extern "C" void HeapProfilerWithPseudoStackStart( + StackGeneratorFunction callback) { + { + // Ensure the callback is set before allocations can be recorded. + SpinLockHolder l(&heap_lock); + stack_generator_function = callback; + } + HeapProfilerStart(NULL); +} + extern "C" void IterateAllocatedObjects(AddressVisitor visitor, void* data) { SpinLockHolder l(&heap_lock); diff --git a/third_party/zlib/zip.target.darwin-arm.mk b/third_party/zlib/zip.target.darwin-arm.mk index e09b30fcdd..bc40f8c779 100644 --- a/third_party/zlib/zip.target.darwin-arm.mk +++ b/third_party/zlib/zip.target.darwin-arm.mk @@ -90,8 +90,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -173,8 +173,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/third_party/zlib/zip.target.darwin-mips.mk b/third_party/zlib/zip.target.darwin-mips.mk index ed582e2fc1..554ba417c7 100644 --- a/third_party/zlib/zip.target.darwin-mips.mk +++ b/third_party/zlib/zip.target.darwin-mips.mk @@ -90,8 +90,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -173,8 +173,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/third_party/zlib/zip.target.darwin-x86.mk b/third_party/zlib/zip.target.darwin-x86.mk index 9486a319c5..101b637dc0 100644 --- a/third_party/zlib/zip.target.darwin-x86.mk +++ b/third_party/zlib/zip.target.darwin-x86.mk @@ -92,8 +92,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -178,8 +178,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/third_party/zlib/zip.target.linux-arm.mk b/third_party/zlib/zip.target.linux-arm.mk index e09b30fcdd..bc40f8c779 100644 --- a/third_party/zlib/zip.target.linux-arm.mk +++ b/third_party/zlib/zip.target.linux-arm.mk @@ -90,8 +90,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -173,8 +173,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/third_party/zlib/zip.target.linux-mips.mk b/third_party/zlib/zip.target.linux-mips.mk index ed582e2fc1..554ba417c7 100644 --- a/third_party/zlib/zip.target.linux-mips.mk +++ b/third_party/zlib/zip.target.linux-mips.mk @@ -90,8 +90,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -173,8 +173,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ diff --git a/third_party/zlib/zip.target.linux-x86.mk b/third_party/zlib/zip.target.linux-x86.mk index 9486a319c5..101b637dc0 100644 --- a/third_party/zlib/zip.target.linux-x86.mk +++ b/third_party/zlib/zip.target.linux-x86.mk @@ -92,8 +92,8 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ @@ -178,8 +178,8 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ - $(LOCAL_PATH) \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/zlib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ |