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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 541983002: athena: Move the USE_ATHENA define into //chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « build/common.gypi ('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 2936 matching lines...) Expand 10 before | Expand all | Expand 10 after
2947 2947
2948 # These files are generated by GRIT. 2948 # These files are generated by GRIT.
2949 '<(grit_out_dir)/grit/component_extension_resources_map.cc', 2949 '<(grit_out_dir)/grit/component_extension_resources_map.cc',
2950 '<(grit_out_dir)/grit/theme_resources_map.cc', 2950 '<(grit_out_dir)/grit/theme_resources_map.cc',
2951 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc', 2951 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/ui_resources_map.cc',
2952 2952
2953 # This file is generated by 2953 # This file is generated by
2954 # chrome/browser/metrics/variations/generate_resources_map.py 2954 # chrome/browser/metrics/variations/generate_resources_map.py
2955 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc', 2955 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/metrics/variations/genera ted_resources_map.cc',
2956 ], 2956 ],
2957 'conditions': [
2958 ['use_athena==1', {
2959 'defines': ['USE_ATHENA=1'],
2960 }],
2961 ],
2957 'defines': [ 2962 'defines': [
2958 '<@(nacl_defines)', 2963 '<@(nacl_defines)',
2959 ], 2964 ],
2960 'direct_dependent_settings': { 2965 'direct_dependent_settings': {
2961 'defines': [ 2966 'defines': [
2962 '<@(nacl_defines)', 2967 '<@(nacl_defines)',
2963 ], 2968 ],
2964 }, 2969 },
2965 }, { # OS == "ios" 2970 }, { # OS == "ios"
2966 'dependencies': [ 2971 'dependencies': [
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after
3568 'variables': { 3573 'variables': {
3569 'proto_in_dir': 'browser/sync_file_system/drive_backend', 3574 'proto_in_dir': 'browser/sync_file_system/drive_backend',
3570 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend', 3575 'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
3571 }, 3576 },
3572 'includes': [ '../build/protoc.gypi' ] 3577 'includes': [ '../build/protoc.gypi' ]
3573 }, 3578 },
3574 ], 3579 ],
3575 },], 3580 },],
3576 ], 3581 ],
3577 } 3582 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698