Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: build/toolchain.gypi

Issue 398643006: Really fix the arm builder bots by copying android_webview_build out one scope in toolchain.gypi (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/android.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 the V8 project authors. All rights reserved. 1 # Copyright 2013 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 # For a shared library build, results in "libv8-<(soname_version).so". 80 # For a shared library build, results in "libv8-<(soname_version).so".
81 'soname_version%': '', 81 'soname_version%': '',
82 82
83 # Allow to suppress the array bounds warning (default is no suppression). 83 # Allow to suppress the array bounds warning (default is no suppression).
84 'wno_array_bounds%': '', 84 'wno_array_bounds%': '',
85 85
86 'variables': { 86 'variables': {
87 # This is set when building the Android WebView inside the Android build 87 # This is set when building the Android WebView inside the Android build
88 # system, using the 'android' gyp backend. 88 # system, using the 'android' gyp backend.
89 'android_webview_build%': 0, 89 'android_webview_build%': 0,
90 } 90 },
91 # Copy it out one scope.
92 'android_webview_build%': '<(android_webview_build)',
91 }, 93 },
92 'conditions': [ 94 'conditions': [
93 ['host_arch=="ia32" or host_arch=="x64" or clang==1', { 95 ['host_arch=="ia32" or host_arch=="x64" or clang==1', {
94 'variables': { 96 'variables': {
95 'host_cxx_is_biarch%': 1, 97 'host_cxx_is_biarch%': 1,
96 }, 98 },
97 }, { 99 }, {
98 'variables': { 100 'variables': {
99 'host_cxx_is_biarch%': 0, 101 'host_cxx_is_biarch%': 0,
100 }, 102 },
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 'OptimizeReferences': '2', 825 'OptimizeReferences': '2',
824 'EnableCOMDATFolding': '2', 826 'EnableCOMDATFolding': '2',
825 }, 827 },
826 }, 828 },
827 }], # OS=="win" 829 }], # OS=="win"
828 ], # conditions 830 ], # conditions
829 }, # Release 831 }, # Release
830 }, # configurations 832 }, # configurations
831 }, # target_defaults 833 }, # target_defaults
832 } 834 }
OLDNEW
« no previous file with comments | « build/android.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698