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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 855753004: Remove remainder of Athena related code from Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_USE_ATHENA5
Patch Set: Created 5 years, 11 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/ui/views/athena/athena_util.cc ('k') | chrome/chrome_browser_extensions.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 3036 matching lines...) Expand 10 before | Expand all | Expand 10 after
3047 3047
3048 # These files are generated by GRIT. 3048 # These files are generated by GRIT.
3049 '<(grit_out_dir)/grit/component_extension_resources_map.cc', 3049 '<(grit_out_dir)/grit/component_extension_resources_map.cc',
3050 '<(grit_out_dir)/grit/theme_resources_map.cc', 3050 '<(grit_out_dir)/grit/theme_resources_map.cc',
3051 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', 3051 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
3052 3052
3053 # This file is generated by 3053 # This file is generated by
3054 # chrome/browser/metrics/variations/generate_resources_map.py 3054 # chrome/browser/metrics/variations/generate_resources_map.py
3055 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc', 3055 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc',
3056 ], 3056 ],
3057 'conditions': [
3058 ['use_athena==1', {
3059 'defines': ['USE_ATHENA=1'],
3060 }],
3061 ],
3062 'defines': [ 3057 'defines': [
3063 '<@(nacl_defines)', 3058 '<@(nacl_defines)',
3064 ], 3059 ],
3065 'direct_dependent_settings': { 3060 'direct_dependent_settings': {
3066 'defines': [ 3061 'defines': [
3067 '<@(nacl_defines)', 3062 '<@(nacl_defines)',
3068 ], 3063 ],
3069 }, 3064 },
3070 }, { # OS == "ios" 3065 }, { # OS == "ios"
3071 'dependencies': [ 3066 'dependencies': [
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
3704 'variables': { 3699 'variables': {
3705 'proto_in_dir': 'browser/sync_file_system/drive_backend', 3700 'proto_in_dir': 'browser/sync_file_system/drive_backend',
3706 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend', 3701 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
3707 }, 3702 },
3708 'includes': [ '../build/protoc.gypi' ] 3703 'includes': [ '../build/protoc.gypi' ]
3709 }, 3704 },
3710 ], 3705 ],
3711 },], 3706 },],
3712 ], 3707 ],
3713 } 3708 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/athena/athena_util.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698