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

Side by Side Diff: chrome/chrome.gyp

Issue 21020004: Move nacl.gypi to components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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 | chrome/chrome_exe.gypi » ('j') | chrome/chrome_exe.gypi » ('J')
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 'conditions': [ 114 'conditions': [
115 ['OS!="ios"', { 115 ['OS!="ios"', {
116 'includes': [ 116 'includes': [
117 'app/policy/policy_templates.gypi', 117 'app/policy/policy_templates.gypi',
118 'chrome_browser_extensions.gypi', 118 'chrome_browser_extensions.gypi',
119 'chrome_dll.gypi', 119 'chrome_dll.gypi',
120 'chrome_exe.gypi', 120 'chrome_exe.gypi',
121 'chrome_installer.gypi', 121 'chrome_installer.gypi',
122 'chrome_renderer.gypi', 122 'chrome_renderer.gypi',
123 'chrome_tests.gypi', 123 'chrome_tests.gypi',
124 'nacl.gypi',
125 '../apps/apps.gypi', 124 '../apps/apps.gypi',
125 '../components/nacl.gypi',
126 ], 126 ],
127 'targets': [ 127 'targets': [
128 { 128 {
129 'target_name': 'default_extensions', 129 'target_name': 'default_extensions',
130 'type': 'none', 130 'type': 'none',
131 'conditions': [ 131 'conditions': [
132 ['OS=="win"', { 132 ['OS=="win"', {
133 'copies': [ 133 'copies': [
134 { 134 {
135 'destination': '<(PRODUCT_DIR)/extensions', 135 'destination': '<(PRODUCT_DIR)/extensions',
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 ], # 'targets' 1190 ], # 'targets'
1191 'includes': [ 1191 'includes': [
1192 'chrome_android.gypi', 1192 'chrome_android.gypi',
1193 ]}, # 'includes' 1193 ]}, # 'includes'
1194 ], # OS=="android" 1194 ], # OS=="android"
1195 ['configuration_policy==1 and OS!="android"', { 1195 ['configuration_policy==1 and OS!="android"', {
1196 'includes': [ 'policy.gypi', ], 1196 'includes': [ 'policy.gypi', ],
1197 }], 1197 }],
1198 ], # 'conditions' 1198 ], # 'conditions'
1199 } 1199 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698