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

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: Windows build fix Created 7 years, 6 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
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 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 '../breakpad/breakpad.gyp:breakpad_sender_win64', 1089 '../breakpad/breakpad.gyp:breakpad_sender_win64',
1090 '../chrome/common_constants.gyp:common_constants_win64', 1090 '../chrome/common_constants.gyp:common_constants_win64',
1091 ], 1091 ],
1092 'include_dirs': [ 1092 'include_dirs': [
1093 '..', 1093 '..',
1094 ], 1094 ],
1095 'sources': [ 1095 'sources': [
1096 'tools/crash_service/crash_service.cc', 1096 'tools/crash_service/crash_service.cc',
1097 'tools/crash_service/crash_service.h', 1097 'tools/crash_service/crash_service.h',
1098 'tools/crash_service/main.cc', 1098 'tools/crash_service/main.cc',
1099 '../components/nacl/common/nacl_switches.cc',
1099 '../content/public/common/content_switches.cc', 1100 '../content/public/common/content_switches.cc',
1100 ], 1101 ],
1101 'defines': [ 1102 'defines': [
1102 'COMPILE_CONTENT_STATICALLY', 1103 'COMPILE_CONTENT_STATICALLY',
1103 ], 1104 ],
1104 'msvs_settings': { 1105 'msvs_settings': {
1105 'VCLinkerTool': { 1106 'VCLinkerTool': {
1106 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1107 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1107 }, 1108 },
1108 }, 1109 },
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 ], # 'targets' 1156 ], # 'targets'
1156 'includes': [ 1157 'includes': [
1157 'chrome_android.gypi', 1158 'chrome_android.gypi',
1158 ]}, # 'includes' 1159 ]}, # 'includes'
1159 ], # OS=="android" 1160 ], # OS=="android"
1160 ['configuration_policy==1 and OS!="android"', { 1161 ['configuration_policy==1 and OS!="android"', {
1161 'includes': [ 'policy.gypi', ], 1162 'includes': [ 'policy.gypi', ],
1162 }], 1163 }],
1163 ], # 'conditions' 1164 ], # 'conditions'
1164 } 1165 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698