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

diff --git a/build/standalone.gypi b/build/standalone.gypi
index 5c017d5f5073986935c3502642588c68d435b629..f18333127a53cf285c861992126f221fe3352a78 100644 (file)
--- 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 be7b9ea696c378a8e5b104422fdb080104841b97..c93deca4f44f35e122e36c578b49382c1f11d157 100644 (file)
--- 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 15d342dece7699237eb88385a8d28fd4353308b3..c033fd7e4e47b00108b14a5282ffc0197516202a 100644 (file)
--- 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 aa01a842f636b9d5ac680354e40d0d5c6f31a0c9..e96cdce213f7e9dfafffb92b25a18ada9c1254e3 100644 (file)
--- 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',
           ],
         }],
       ],