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

Side by Side Diff: chrome/chrome_browser_extensions.gypi

Issue 718313002: Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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_extensions_chromeos_sources': [ 7 'chrome_browser_extensions_chromeos_sources': [
8 'browser/extensions/api/diagnostics/diagnostics_api.cc', 8 'browser/extensions/api/diagnostics/diagnostics_api.cc',
9 'browser/extensions/api/diagnostics/diagnostics_api.h', 9 'browser/extensions/api/diagnostics/diagnostics_api.h',
10 'browser/extensions/api/diagnostics/diagnostics_api_chromeos.cc', 10 'browser/extensions/api/diagnostics/diagnostics_api_chromeos.cc',
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 'export_dependent_settings': [ 958 'export_dependent_settings': [
959 'browser/extensions/api/api_registration.gyp:chrome_api_registration', 959 'browser/extensions/api/api_registration.gyp:chrome_api_registration',
960 'common/extensions/api/api.gyp:chrome_api', 960 'common/extensions/api/api.gyp:chrome_api',
961 '../content/content.gyp:content_browser', 961 '../content/content.gyp:content_browser',
962 ], 962 ],
963 'sources': [ 963 'sources': [
964 '<@(chrome_browser_extensions_enabled_sources)', 964 '<@(chrome_browser_extensions_enabled_sources)',
965 ], 965 ],
966 'conditions': [ 966 'conditions': [
967 ['chromeos==1', { 967 ['chromeos==1', {
968 'include_dirs': [ 968 'conditions': [
969 '../third_party/libjingle/source', 969 ['use_x11==1', {
970 'dependencies': [
971 '../remoting/remoting.gyp:remoting_it2me_host_static',
972 ],
973 'include_dirs': [
974 '../third_party/libjingle/source',
975 ],
976 }]
970 ], 977 ],
971 'dependencies': [ 978 'dependencies': [
972 '../build/linux/system.gyp:dbus', 979 '../build/linux/system.gyp:dbus',
973 '../chromeos/ime/input_method.gyp:gencode', 980 '../chromeos/ime/input_method.gyp:gencode',
974 '../remoting/remoting.gyp:remoting_it2me_host_static',
975 '../third_party/libevent/libevent.gyp:libevent', 981 '../third_party/libevent/libevent.gyp:libevent',
976 ], 982 ],
977 'sources': [ 983 'sources': [
978 '<@(chrome_browser_extensions_chromeos_sources)', 984 '<@(chrome_browser_extensions_chromeos_sources)',
979 ], 985 ],
980 }, { # chromeos==0 986 }, { # chromeos==0
981 'sources': [ 987 'sources': [
982 'browser/extensions/default_apps.cc', 988 'browser/extensions/default_apps.cc',
983 'browser/extensions/default_apps.h', 989 'browser/extensions/default_apps.h',
984 '<@(chrome_browser_extensions_non_chromeos_sources)', 990 '<@(chrome_browser_extensions_non_chromeos_sources)',
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 ], 1125 ],
1120 }, { # use_brlapi==0 1126 }, { # use_brlapi==0
1121 'sources': [ 1127 'sources': [
1122 'browser/extensions/api/braille_display_private/braille_controller_s tub.cc', 1128 'browser/extensions/api/braille_display_private/braille_controller_s tub.cc',
1123 ], 1129 ],
1124 }], 1130 }],
1125 ], 1131 ],
1126 }, 1132 },
1127 ], 1133 ],
1128 } 1134 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/messaging/native_message_host_chromeos.cc ('k') | remoting/host/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698