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

Side by Side Diff: chrome/chrome_browser_chromeos.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 | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_ui.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1025 'browser/supervised_user/chromeos/manager_password_service.cc', 1025 'browser/supervised_user/chromeos/manager_password_service.cc',
1026 'browser/supervised_user/chromeos/manager_password_service.h', 1026 'browser/supervised_user/chromeos/manager_password_service.h',
1027 'browser/supervised_user/chromeos/manager_password_service_factory.cc', 1027 'browser/supervised_user/chromeos/manager_password_service_factory.cc',
1028 'browser/supervised_user/chromeos/manager_password_service_factory.h', 1028 'browser/supervised_user/chromeos/manager_password_service_factory.h',
1029 'browser/supervised_user/chromeos/supervised_user_password_service.cc', 1029 'browser/supervised_user/chromeos/supervised_user_password_service.cc',
1030 'browser/supervised_user/chromeos/supervised_user_password_service.h', 1030 'browser/supervised_user/chromeos/supervised_user_password_service.h',
1031 'browser/supervised_user/chromeos/supervised_user_password_service_facto ry.cc', 1031 'browser/supervised_user/chromeos/supervised_user_password_service_facto ry.cc',
1032 'browser/supervised_user/chromeos/supervised_user_password_service_facto ry.h', 1032 'browser/supervised_user/chromeos/supervised_user_password_service_facto ry.h',
1033 ], 1033 ],
1034 'conditions': [ 1034 'conditions': [
1035 ['use_athena==1', {
1036 'defines': ['USE_ATHENA=1'],
1037 }],
1035 ['enable_extensions==1', { 1038 ['enable_extensions==1', {
1036 'dependencies': [ 1039 'dependencies': [
1037 '../ui/file_manager/file_manager.gyp:file_manager', 1040 '../ui/file_manager/file_manager.gyp:file_manager',
1038 ], 1041 ],
1039 'sources': [ 1042 'sources': [
1040 # Only extension API implementations should go here. 1043 # Only extension API implementations should go here.
1041 'browser/chromeos/extensions/echo_private_api.cc', 1044 'browser/chromeos/extensions/echo_private_api.cc',
1042 'browser/chromeos/extensions/echo_private_api.h', 1045 'browser/chromeos/extensions/echo_private_api.h',
1043 'browser/chromeos/extensions/file_manager/device_event_router.cc', 1046 'browser/chromeos/extensions/file_manager/device_event_router.cc',
1044 'browser/chromeos/extensions/file_manager/device_event_router.h', 1047 'browser/chromeos/extensions/file_manager/device_event_router.h',
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1197 'browser/chromeos/attestation/attestation_signed_data.proto', 1200 'browser/chromeos/attestation/attestation_signed_data.proto',
1198 ], 1201 ],
1199 'variables': { 1202 'variables': {
1200 'proto_in_dir': 'browser/chromeos/attestation', 1203 'proto_in_dir': 'browser/chromeos/attestation',
1201 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1204 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1202 }, 1205 },
1203 'includes': [ '../build/protoc.gypi' ] 1206 'includes': [ '../build/protoc.gypi' ]
1204 }, 1207 },
1205 ], 1208 ],
1206 } 1209 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698