Reviewers: Jakob,

Message:
Fingers crossed this time... PTAL, thanks.

Description:
Really fix the arm builder bots by copying android_webview_build out one scope
in toolchain.gypi

Move android_webview_build variable to toolchain.gypi to fix arm builders.

Please review this at https://codereview.chromium.org/398643006/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+3, -3 lines):
  M build/android.gypi
  M build/toolchain.gypi


Index: build/android.gypi
diff --git a/build/android.gypi b/build/android.gypi
index 87bdbcb4ddda644f4f2e5782718712aed2c5744b..bfb2bff84640a9df4348ffeee101ccecb719602a 100644
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -61,8 +61,6 @@
     # link the NDK one?
     'use_system_stlport%': '<(android_webview_build)',
     'android_stlport_library': 'stlport_static',
-    # Copy it out one scope.
-    'android_webview_build%': '<(android_webview_build)',
   },  # variables
   'target_defaults': {
     'defines': [
Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index f2847c5627b90e8cb80b6bd6b06f0b6ff8068463..8846dc5c007149297f68a098bd5405f99d26425a 100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -87,7 +87,9 @@
# This is set when building the Android WebView inside the Android build
       # system, using the 'android' gyp backend.
       'android_webview_build%': 0,
-    }
+    },
+    # Copy it out one scope.
+    'android_webview_build%': '1',#<(android_webview_build)',
   },
   'conditions': [
     ['host_arch=="ia32" or host_arch=="x64" or clang==1', {


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to