From b3310c3a980658e36265e9095af8b6486e55c5a7 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Tue, 17 Sep 2013 08:31:56 +0000 Subject: [PATCH] Use icu_gyp_path variable to reference ICU gyp file That way, embedders can put the icu sources whereever they want and aren't forced to put them under third_party/gyp BUG=none R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/23598011 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16749 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- build/standalone.gypi | 3 +++ samples/samples.gyp | 6 +++--- src/d8.gyp | 6 +++--- tools/gyp/v8.gyp | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build/standalone.gypi b/build/standalone.gypi index 5c017d5..f183331 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -77,6 +77,9 @@ # as errors. 'v8_code%': 0, + # Relative path to icu.gyp from this file. + 'icu_gyp_path': '../third_party/icu/icu.gyp', + 'conditions': [ ['(v8_target_arch=="arm" and host_arch!="arm") or \ (v8_target_arch=="mipsel" and host_arch!="mipsel") or \ diff --git a/samples/samples.gyp b/samples/samples.gyp index be7b9ea..c93deca 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -42,13 +42,13 @@ 'conditions': [ ['v8_enable_i18n_support==1', { 'dependencies': [ - '<(DEPTH)/third_party/icu/icu.gyp:icui18n', - '<(DEPTH)/third_party/icu/icu.gyp:icuuc', + '<(icu_gyp_path):icui18n', + '<(icu_gyp_path):icuuc', ], }], ['OS=="win" and v8_enable_i18n_support==1', { 'dependencies': [ - '<(DEPTH)/third_party/icu/icu.gyp:icudata', + '<(icu_gyp_path):icudata', ], }], ], diff --git a/src/d8.gyp b/src/d8.gyp index 15d342d..c033fd7 100644 --- a/src/d8.gyp +++ b/src/d8.gyp @@ -81,13 +81,13 @@ }], ['v8_enable_i18n_support==1', { 'dependencies': [ - '<(DEPTH)/third_party/icu/icu.gyp:icui18n', - '<(DEPTH)/third_party/icu/icu.gyp:icuuc', + '<(icu_gyp_path):icui18n', + '<(icu_gyp_path):icuuc', ], }], ['OS=="win" and v8_enable_i18n_support==1', { 'dependencies': [ - '<(DEPTH)/third_party/icu/icu.gyp:icudata', + '<(icu_gyp_path):icudata', ], }], ], diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index aa01a84..e96cdce 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -855,8 +855,8 @@ }], ['v8_enable_i18n_support==1', { 'dependencies': [ - '<(DEPTH)/third_party/icu/icu.gyp:icui18n', - '<(DEPTH)/third_party/icu/icu.gyp:icuuc', + '<(icu_gyp_path):icui18n', + '<(icu_gyp_path):icuuc', ] }, { # v8_enable_i18n_support==0 'sources!': [ @@ -866,7 +866,7 @@ }], ['OS=="win" and v8_enable_i18n_support==1', { 'dependencies': [ - '<(DEPTH)/third_party/icu/icu.gyp:icudata', + '<(icu_gyp_path):icudata', ], }], ], -- 2.7.4