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

Side by Side Diff: build/all.gyp

Issue 189583010: Remove yasm.gyp from all.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
« no previous file with comments | « no previous file | 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 '../v8/tools/gyp/v8.gyp:*', 106 '../v8/tools/gyp/v8.gyp:*',
107 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy p:*', 107 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy p:*',
108 '<(libjpeg_gyp_path):*', 108 '<(libjpeg_gyp_path):*',
109 ], 109 ],
110 }], 110 }],
111 ['OS!="android" and OS!="ios"', { 111 ['OS!="android" and OS!="ios"', {
112 'dependencies': [ 112 'dependencies': [
113 '../chrome/tools/profile_reset/jtl_compiler.gyp:*', 113 '../chrome/tools/profile_reset/jtl_compiler.gyp:*',
114 ], 114 ],
115 }], 115 }],
116 ['os_posix==1 and OS!="android" and OS!="ios"', {
117 'dependencies': [
118 '../third_party/yasm/yasm.gyp:*#host',
119 ],
120 }],
121 ['OS=="mac" or OS=="ios" or OS=="win"', { 116 ['OS=="mac" or OS=="ios" or OS=="win"', {
122 'dependencies': [ 117 'dependencies': [
123 '../third_party/nss/nss.gyp:*', 118 '../third_party/nss/nss.gyp:*',
124 ], 119 ],
125 }], 120 }],
126 ['OS=="win" or OS=="ios" or OS=="linux"', { 121 ['OS=="win" or OS=="ios" or OS=="linux"', {
127 'dependencies': [ 122 'dependencies': [
128 '../breakpad/breakpad.gyp:*', 123 '../breakpad/breakpad.gyp:*',
129 ], 124 ],
130 }], 125 }],
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1234 # http://crbug.com/157234 1229 # http://crbug.com/157234
1235 #'../chrome/chrome.gyp:sync_integration_tests_run', 1230 #'../chrome/chrome.gyp:sync_integration_tests_run',
1236 '../chrome/chrome.gyp:unit_tests_run', 1231 '../chrome/chrome.gyp:unit_tests_run',
1237 '../net/net.gyp:net_unittests_run', 1232 '../net/net.gyp:net_unittests_run',
1238 ], 1233 ],
1239 }, # target_name: chromium_swarm_tests 1234 }, # target_name: chromium_swarm_tests
1240 ], 1235 ],
1241 }], 1236 }],
1242 ], # conditions 1237 ], # conditions
1243 } 1238 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698