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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/extensions/api/api.gyp

Issue 26608002: Fix api gyp target on chromeos and android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: webrtc Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/api/api.gyp
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 8a14555919f4b7390f67129abdf601dd3f4cb838..fbc54f03da25c8030fc135ce94e927a567c3e2c2 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -18,107 +18,143 @@
],
'variables': {
'chromium_code': 1,
- 'schema_files': [
- 'alarms.idl',
- 'activity_log_private.json',
- 'adview.json',
- 'app_current_window_internal.idl',
- 'app_runtime.idl',
- 'app_window.idl',
- 'audio.idl',
- 'autotest_private.idl',
- 'bluetooth.idl',
- 'bookmark_manager_private.json',
- 'bookmarks.json',
- 'braille_display_private.idl',
- 'browsing_data.json',
- 'cast_channel.idl',
- 'chromeos_info_private.json',
- 'cloud_print_private.json',
- 'command_line_private.json',
- 'content_settings.json',
- 'context_menus.json',
- 'cookies.json',
- 'debugger.json',
- 'developer_private.idl',
- 'desktop_capture.idl',
- 'diagnostics.idl',
- 'dial.idl',
- 'dns.idl',
- 'downloads.idl',
- 'echo_private.json',
- 'downloads_internal.idl',
- 'enterprise_platform_keys_private.json',
- 'events.json',
- 'experimental_accessibility.json',
- 'experimental_discovery.idl',
- 'experimental_history.json',
- 'experimental_identity.idl',
- 'file_browser_private.json',
- 'location.idl',
- 'system_memory.idl',
- 'extension.json',
- 'feedback_private.idl',
- 'file_browser_handler_internal.json',
- 'file_system.idl',
- 'font_settings.json',
- 'history.json',
- 'i18n.json',
- 'identity.idl',
- 'identity_private.idl',
- 'idle.json',
- 'idltest.idl',
- 'infobars.json',
- 'input_ime.json',
- 'log_private.idl',
- 'management.json',
- 'manifest_types.json',
- 'mdns.idl',
- 'media_galleries.idl',
- 'media_galleries_private.idl',
- 'media_player_private.json',
- 'metrics_private.json',
- 'music_manager_private.idl',
- 'networking_private.json',
- 'notifications.idl',
- 'omnibox.json',
- 'page_capture.json',
- 'permissions.json',
- 'preferences_private.json',
- 'principals_private.idl',
- 'power.idl',
- 'push_messaging.idl',
- 'image_writer_private.idl',
- 'runtime.json',
- 'serial.idl',
- 'sessions.json',
- 'signed_in_devices.idl',
- 'socket.idl',
- 'sockets_udp.idl',
- 'storage.json',
- 'sync_file_system.idl',
- 'system_indicator.idl',
- 'system_cpu.idl',
- 'system_display.idl',
- 'system_storage.idl',
- 'system_private.json',
- 'tab_capture.idl',
- 'tabs.json',
- 'terminal_private.json',
- 'test.json',
- 'top_sites.json',
- 'usb.idl',
- 'virtual_keyboard_private.json',
- 'wallpaper.json',
- 'wallpaper_private.json',
- 'web_navigation.json',
- 'web_request.json',
- 'webrtc_cast_send_transport.idl',
- 'webrtc_logging_private.idl',
- 'webrtc_udp_transport.idl',
- 'webstore_private.json',
- 'webview.json',
- 'windows.json',
+ 'conditions': [
+ ['OS!="android"', {
+ 'schema_files': [
+ 'activity_log_private.json',
+ 'adview.json',
+ 'alarms.idl',
+ 'app_current_window_internal.idl',
+ 'app_runtime.idl',
+ 'app_window.idl',
+ 'audio.idl',
+ 'autotest_private.idl',
+ 'bluetooth.idl',
+ 'bookmark_manager_private.json',
+ 'bookmarks.json',
+ 'braille_display_private.idl',
+ 'browsing_data.json',
+ 'cast_channel.idl',
+ 'chromeos_info_private.json',
+ 'cloud_print_private.json',
+ 'command_line_private.json',
+ 'content_settings.json',
+ 'context_menus.json',
+ 'cookies.json',
+ 'debugger.json',
+ 'desktop_capture.idl',
+ 'developer_private.idl',
+ 'diagnostics.idl',
+ 'dial.idl',
+ 'dns.idl',
+ 'downloads.idl',
+ 'downloads_internal.idl',
+ 'echo_private.json',
+ 'enterprise_platform_keys_private.json',
+ 'events.json',
+ 'experimental_accessibility.json',
+ 'experimental_discovery.idl',
+ 'experimental_history.json',
+ 'experimental_identity.idl',
+ 'extension.json',
+ 'feedback_private.idl',
+ 'file_browser_private.json',
+ 'file_system.idl',
+ 'font_settings.json',
+ 'history.json',
+ 'i18n.json',
+ 'identity.idl',
+ 'identity_private.idl',
+ 'idle.json',
+ 'idltest.idl',
+ 'image_writer_private.idl',
+ 'infobars.json',
+ 'input_ime.json',
+ 'location.idl',
+ 'log_private.idl',
+ 'management.json',
+ 'manifest_types.json',
+ 'mdns.idl',
+ 'media_galleries.idl',
+ 'media_galleries_private.idl',
+ 'media_player_private.json',
+ 'metrics_private.json',
+ 'music_manager_private.idl',
+ 'networking_private.json',
+ 'notifications.idl',
+ 'omnibox.json',
+ 'page_capture.json',
+ 'permissions.json',
+ 'power.idl',
+ 'preferences_private.json',
+ 'principals_private.idl',
+ 'push_messaging.idl',
+ 'runtime.json',
+ 'serial.idl',
+ 'sessions.json',
+ 'signed_in_devices.idl',
+ 'socket.idl',
+ 'sockets_udp.idl',
+ 'storage.json',
+ 'sync_file_system.idl',
+ 'system_cpu.idl',
+ 'system_display.idl',
+ 'system_indicator.idl',
+ 'system_memory.idl',
+ 'system_private.json',
+ 'system_storage.idl',
+ 'tab_capture.idl',
+ 'tabs.json',
+ 'terminal_private.json',
+ 'test.json',
+ 'top_sites.json',
+ 'usb.idl',
+ 'virtual_keyboard_private.json',
+ 'web_navigation.json',
+ 'web_request.json',
+ 'webstore_private.json',
+ 'webview.json',
+ 'windows.json',
+ ],
+ }, { # OS=="android"
+ 'schema_files': [
+ # These should be eliminated. See crbug.com/305852.
+ 'activity_log_private.json',
+ 'alarms.idl',
+ 'app_runtime.idl',
+ 'app_window.idl',
+ 'context_menus.json',
+ 'downloads.idl',
+ 'events.json',
+ 'feedback_private.idl',
+ 'file_system.idl',
+ 'manifest_types.json',
+ 'omnibox.json',
+ 'permissions.json',
+ 'runtime.json',
+ 'storage.json',
+ 'sync_file_system.idl',
+ 'tab_capture.idl',
+ 'tabs.json',
+ 'web_navigation.json',
+ 'web_request.json',
+ 'windows.json',
+ ],
+ }],
+ ['chromeos==1', {
+ 'schema_files': [
+ 'file_browser_handler_internal.json',
+ 'wallpaper.json',
+ 'wallpaper_private.json',
+ ],
+ }],
+ ['enable_webrtc==1', {
+ 'schema_files': [
+ 'webrtc_cast_send_transport.idl',
+ 'webrtc_logging_private.idl',
+ 'webrtc_udp_transport.idl',
+ ],
+ }],
],
'cc_dir': 'chrome/common/extensions/api',
'root_namespace': 'extensions::api',
@@ -128,58 +164,9 @@
'<(DEPTH)/sync/sync.gyp:sync',
],
'conditions': [
- ['OS=="android"', {
- 'sources!': [
- 'autotest_private.idl',
- 'bookmark_manager_private.json',
- 'browsing_data.json',
- 'chromeos_info_private.json',
- 'command_line_private.json',
- 'developer_private.idl',
- 'dial.idl',
- 'downloads_internal.idl',
- 'echo_private.json',
- 'enterprise_platform_keys_private.json',
- 'experimental_accessibility.json',
- 'experimental_discovery.idl',
- 'experimental_dns.idl',
- 'experimental_history.json',
- 'experimental_identity.idl',
- 'experimental_idltest.idl',
- 'extension.json',
- 'file_browser_handler_internal.json',
- 'font_settings.json',
- 'i18n.json',
- 'identity.idl',
- 'identity_private.idl',
- 'idle.json',
- 'infobars.json',
- 'input_ime.json',
- 'media_player_private.json',
- 'music_manager_private.idl',
- 'networking_private.json',
- 'power.idl',
- 'principals_private.idl',
- 'system_indicator.idl',
- 'system_private.json',
- 'terminal_private.json',
- 'test.json',
- 'top_sites.json',
- 'webview.json',
- ],
- }],
- ['OS!="chromeos"', {
- 'schema_files!': [
- 'file_browser_handler_internal.json',
- 'log_private.idl',
- 'virtual_keyboard_private.json',
- 'wallpaper.json',
- 'wallpaper_private.json',
- ],
- }],
- ['enable_webrtc==0', {
- 'schema_files!': [
- 'webrtc_logging_private.idl',
+ ['chromeos==1', {
+ 'dependencies': [
+ '<(DEPTH)/chrome/chrome.gyp:drive_proto',
],
}],
],
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698