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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 912503003: Remove "nacl_defines" from the GYP build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/chrome.gyp ('k') | chrome/chrome_browser_chromeos.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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 # All .cc, .h, .m, and .mm files under browser except for: 7 # All .cc, .h, .m, and .mm files under browser except for:
8 # * tests and mocks. 8 # * tests and mocks.
9 # * code below browser/chromeos 9 # * code below browser/chromeos
10 # * code below browser/extensions 10 # * code below browser/extensions
(...skipping 3034 matching lines...) Expand 10 before | Expand all | Expand 10 after
3045 3045
3046 # These files are generated by GRIT. 3046 # These files are generated by GRIT.
3047 '<(grit_out_dir)/grit/component_extension_resources_map.cc', 3047 '<(grit_out_dir)/grit/component_extension_resources_map.cc',
3048 '<(grit_out_dir)/grit/theme_resources_map.cc', 3048 '<(grit_out_dir)/grit/theme_resources_map.cc',
3049 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', 3049 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
3050 3050
3051 # This file is generated by 3051 # This file is generated by
3052 # chrome/browser/metrics/variations/generate_resources_map.py 3052 # chrome/browser/metrics/variations/generate_resources_map.py
3053 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc', 3053 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc',
3054 ], 3054 ],
3055 'defines': [
3056 '<@(nacl_defines)',
3057 ],
3058 'direct_dependent_settings': {
3059 'defines': [
3060 '<@(nacl_defines)',
3061 ],
3062 },
3063 }, { # OS == "ios" 3055 }, { # OS == "ios"
3064 'dependencies': [ 3056 'dependencies': [
3065 '../net/net.gyp:net', 3057 '../net/net.gyp:net',
3066 ], 3058 ],
3067 # A few sources had been brought up for iOS before the decision not to 3059 # A few sources had been brought up for iOS before the decision not to
3068 # use chrome/ for iOS long-term. Keep building them to prevent iOS 3060 # use chrome/ for iOS long-term. Keep building them to prevent iOS
3069 # regressions until they have been componentized. 3061 # regressions until they have been componentized.
3070 'sources': [ 3062 'sources': [
3071 '<@(chrome_browser_ios_sources)', 3063 '<@(chrome_browser_ios_sources)',
3072 '<@(chrome_browser_google_sources)', 3064 '<@(chrome_browser_google_sources)',
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
3703 'variables': { 3695 'variables': {
3704 'proto_in_dir': 'browser/sync_file_system/drive_backend', 3696 'proto_in_dir': 'browser/sync_file_system/drive_backend',
3705 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend', 3697 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
3706 }, 3698 },
3707 'includes': [ '../build/protoc.gypi' ] 3699 'includes': [ '../build/protoc.gypi' ]
3708 }, 3700 },
3709 ], 3701 ],
3710 },], 3702 },],
3711 ], 3703 ],
3712 } 3704 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698