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

Side by Side Diff: chrome/chrome.gyp

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Create a zygote folder Created 7 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
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | chrome/chrome_browser.gypi » ('j') | 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 '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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 'conditions': [ 161 'conditions': [
162 ['OS!="ios"', { 162 ['OS!="ios"', {
163 'includes': [ 163 'includes': [
164 'app/policy/policy_templates.gypi', 164 'app/policy/policy_templates.gypi',
165 'chrome_browser_extensions.gypi', 165 'chrome_browser_extensions.gypi',
166 'chrome_dll.gypi', 166 'chrome_dll.gypi',
167 'chrome_exe.gypi', 167 'chrome_exe.gypi',
168 'chrome_installer.gypi', 168 'chrome_installer.gypi',
169 'chrome_renderer.gypi', 169 'chrome_renderer.gypi',
170 'chrome_tests.gypi', 170 'chrome_tests.gypi',
171 'nacl.gypi',
172 '../apps/apps.gypi', 171 '../apps/apps.gypi',
172 '../components/nacl.gypi',
173 ], 173 ],
174 'targets': [ 174 'targets': [
175 { 175 {
176 'target_name': 'default_extensions', 176 'target_name': 'default_extensions',
177 'type': 'none', 177 'type': 'none',
178 'conditions': [ 178 'conditions': [
179 ['OS=="win"', { 179 ['OS=="win"', {
180 'copies': [ 180 'copies': [
181 { 181 {
182 'destination': '<(PRODUCT_DIR)/extensions', 182 'destination': '<(PRODUCT_DIR)/extensions',
(...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 ], # 'targets' 1168 ], # 'targets'
1169 'includes': [ 1169 'includes': [
1170 'chrome_android.gypi', 1170 'chrome_android.gypi',
1171 ]}, # 'includes' 1171 ]}, # 'includes'
1172 ], # OS=="android" 1172 ], # OS=="android"
1173 ['configuration_policy==1 and OS!="android"', { 1173 ['configuration_policy==1 and OS!="android"', {
1174 'includes': [ 'policy.gypi', ], 1174 'includes': [ 'policy.gypi', ],
1175 }], 1175 }],
1176 ], # 'conditions' 1176 ], # 'conditions'
1177 } 1177 }
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698