diff options
| author | Bo Liu <boliu@google.com> | 2014-08-06 11:10:47 -0700 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2014-08-06 11:10:47 -0700 |
| commit | b3d0e079a65545810a4c3b5fc0852b028d0d617e (patch) | |
| tree | f50ea9f720c2334ee731b6e30061bd552c85a756 | |
| parent | 4c53db1e498c213c9abc22f57fb5393e0c695c41 (diff) | |
| download | v8-b3d0e079a65545810a4c3b5fc0852b028d0d617e.tar.gz | |
Update makefiles after merge of Chromium at 37.0.2062.68
This commit was generated by merge_from_chromium.py.
Change-Id: Ieb2b8b533ee5c2dd5fb0f260411066814628065d
| -rw-r--r-- | tools/gyp/v8_base.target.darwin-arm.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.darwin-arm64.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.darwin-mips.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.darwin-x86.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.darwin-x86_64.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.linux-arm.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.linux-arm64.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.linux-mips.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.linux-x86.mk | 8 | ||||
| -rw-r--r-- | tools/gyp/v8_base.target.linux-x86_64.mk | 8 |
10 files changed, 40 insertions, 40 deletions
diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk index 0b6991b24..b398bf062 100644 --- a/tools/gyp/v8_base.target.darwin-arm.mk +++ b/tools/gyp/v8_base.target.darwin-arm.mk @@ -298,8 +298,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -412,8 +412,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk index 3bf85e6a1..57f8cd17b 100644 --- a/tools/gyp/v8_base.target.darwin-arm64.mk +++ b/tools/gyp/v8_base.target.darwin-arm64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -388,8 +388,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk index 848edfa1f..9f20cd391 100644 --- a/tools/gyp/v8_base.target.darwin-mips.mk +++ b/tools/gyp/v8_base.target.darwin-mips.mk @@ -294,8 +294,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -404,8 +404,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk index f1e190ec9..08454c157 100644 --- a/tools/gyp/v8_base.target.darwin-x86.mk +++ b/tools/gyp/v8_base.target.darwin-x86.mk @@ -289,8 +289,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -395,8 +395,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk index 58dc19c4c..2eca06df7 100644 --- a/tools/gyp/v8_base.target.darwin-x86_64.mk +++ b/tools/gyp/v8_base.target.darwin-x86_64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -393,8 +393,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk index 0b6991b24..b398bf062 100644 --- a/tools/gyp/v8_base.target.linux-arm.mk +++ b/tools/gyp/v8_base.target.linux-arm.mk @@ -298,8 +298,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -412,8 +412,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk index 3bf85e6a1..57f8cd17b 100644 --- a/tools/gyp/v8_base.target.linux-arm64.mk +++ b/tools/gyp/v8_base.target.linux-arm64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -388,8 +388,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk index 848edfa1f..9f20cd391 100644 --- a/tools/gyp/v8_base.target.linux-mips.mk +++ b/tools/gyp/v8_base.target.linux-mips.mk @@ -294,8 +294,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -404,8 +404,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk index f1e190ec9..08454c157 100644 --- a/tools/gyp/v8_base.target.linux-x86.mk +++ b/tools/gyp/v8_base.target.linux-x86.mk @@ -289,8 +289,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -395,8 +395,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk index 58dc19c4c..2eca06df7 100644 --- a/tools/gyp/v8_base.target.linux-x86_64.mk +++ b/tools/gyp/v8_base.target.linux-x86_64.mk @@ -288,8 +288,8 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -393,8 +393,8 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ $(LOCAL_PATH)/v8 \ $(gyp_shared_intermediate_dir) \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |