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

Side by Side Diff: chrome/chrome_browser_ui.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_browser_chromeos.gypi ('k') | components/components_tests.gyp » ('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 # There are two sections of sources: 7 # There are two sections of sources:
8 # * "Platform"-based sources (OS, toolkit, etc.) 8 # * "Platform"-based sources (OS, toolkit, etc.)
9 # * Feature/directory-based sources (e.g., history, printing) 9 # * Feature/directory-based sources (e.g., history, printing)
10 10
(...skipping 2725 matching lines...) Expand 10 before | Expand all | Expand 10 after
2736 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 2736 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
2737 '../third_party/npapi/npapi.gyp:npapi', 2737 '../third_party/npapi/npapi.gyp:npapi',
2738 '../third_party/re2/re2.gyp:re2', 2738 '../third_party/re2/re2.gyp:re2',
2739 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', 2739 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
2740 '../ui/compositor/compositor.gyp:compositor', 2740 '../ui/compositor/compositor.gyp:compositor',
2741 '../ui/native_theme/native_theme.gyp:native_theme', 2741 '../ui/native_theme/native_theme.gyp:native_theme',
2742 '../ui/surface/surface.gyp:surface', 2742 '../ui/surface/surface.gyp:surface',
2743 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 2743 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
2744 '../v8/tools/gyp/v8.gyp:v8', 2744 '../v8/tools/gyp/v8.gyp:v8',
2745 ], 2745 ],
2746 'defines': [
2747 '<@(nacl_defines)',
2748 ],
2749 'direct_dependent_settings': {
2750 'defines': [
2751 '<@(nacl_defines)',
2752 ],
2753 },
2754 }, { # OS == "ios" 2746 }, { # OS == "ios"
2755 'sources': [ 2747 'sources': [
2756 '<@(chrome_browser_ui_ios_sources)' 2748 '<@(chrome_browser_ui_ios_sources)'
2757 ], 2749 ],
2758 'sources!': [ 2750 'sources!': [
2759 'browser/ui/external_protocol_dialog_delegate.cc', 2751 'browser/ui/external_protocol_dialog_delegate.cc',
2760 'browser/ui/startup/default_browser_prompt.cc', 2752 'browser/ui/startup/default_browser_prompt.cc',
2761 ], 2753 ],
2762 'dependencies': [ 2754 'dependencies': [
2763 '../net/net.gyp:net', 2755 '../net/net.gyp:net',
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
3133 ], 3125 ],
3134 'sources': [ 3126 'sources': [
3135 '<@(chrome_browser_ui_non_mobile_sources)', 3127 '<@(chrome_browser_ui_non_mobile_sources)',
3136 '<@(chrome_browser_ui_omnibox_non_mobile_sources)', 3128 '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
3137 ], 3129 ],
3138 }], 3130 }],
3139 ], 3131 ],
3140 }, 3132 },
3141 ], 3133 ],
3142 } 3134 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698