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

Side by Side Diff: chrome/chrome_browser_ui.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_chromeos.gypi ('k') | no next file » | 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 'chrome_browser_ui_non_ios_sources': [ 7 'chrome_browser_ui_non_ios_sources': [
8 'browser/ui/accelerator_utils.h', 8 'browser/ui/accelerator_utils.h',
9 'browser/ui/android/android_about_app_info.cc', 9 'browser/ui/android/android_about_app_info.cc',
10 'browser/ui/android/android_about_app_info.h', 10 'browser/ui/android/android_about_app_info.h',
(...skipping 2711 matching lines...) Expand 10 before | Expand all | Expand 10 after
2722 ], 2722 ],
2723 'conditions': [ 2723 'conditions': [
2724 ['chromeos == 0', { 2724 ['chromeos == 0', {
2725 'sources': [ '<@(chrome_browser_ui_ash_non_chromeos)' ], 2725 'sources': [ '<@(chrome_browser_ui_ash_non_chromeos)' ],
2726 }], 2726 }],
2727 ], 2727 ],
2728 }, { # use_ash==0 2728 }, { # use_ash==0
2729 'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ], 2729 'sources': [ '<@(chrome_browser_ui_non_ash_sources)' ],
2730 }], 2730 }],
2731 ['use_athena==1', { 2731 ['use_athena==1', {
2732 'defines': ['USE_ATHENA=1'],
2732 'sources': [ '<@(chrome_browser_ui_athena_sources)' ], 2733 'sources': [ '<@(chrome_browser_ui_athena_sources)' ],
2733 'dependencies': [ 2734 'dependencies': [
2734 '<(DEPTH)/athena/athena.gyp:athena_lib', 2735 '<(DEPTH)/athena/athena.gyp:athena_lib',
2735 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib', 2736 '<(DEPTH)/athena/athena.gyp:athena_chrome_lib',
2736 '<(DEPTH)/athena/athena.gyp:athena_content_lib', 2737 '<(DEPTH)/athena/athena.gyp:athena_content_lib',
2737 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib', 2738 '<(DEPTH)/athena/main/athena_main.gyp:athena_main_lib',
2738 ], 2739 ],
2739 }], 2740 }],
2740 ['toolkit_views==1', { 2741 ['toolkit_views==1', {
2741 'sources': [ '<@(chrome_browser_ui_views_sources)' ], 2742 'sources': [ '<@(chrome_browser_ui_views_sources)' ],
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
2987 }], 2988 }],
2988 ['OS!="android" and OS!="ios"', { 2989 ['OS!="android" and OS!="ios"', {
2989 'dependencies': [ 2990 'dependencies': [
2990 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 2991 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
2991 ], 2992 ],
2992 }], 2993 }],
2993 ], 2994 ],
2994 }, 2995 },
2995 ], 2996 ],
2996 } 2997 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_chromeos.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698