Skip to content

GitLab

T
tangled
Commit 3548bcfd authored by brettw's avatar brettw Committed by Commit bot
Browse files
Options

Inline extensions API gyp into GN build. 

Delete the associated GYP files.

TBR=dpranke@chromium.org

Review-Url: https://codereview.chromium.org/2316293002
Cr-Commit-Position: refs/heads/master@{#417072}
parent 227d9305
Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 290 deletions
chrome/common/extensions/api/BUILD.gn
View file @ 3548bcfd
...@@ -2,12 +2,166 @@ ...@@ -2,12 +2,166 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//build/json_schema_api.gni") import("//build/json_schema_api.gni")
import("//tools/json_schema_compiler/json_features.gni") import("//tools/json_schema_compiler/json_features.gni")
import("schemas.gni")
assert(enable_extensions) assert(enable_extensions)
schema_sources = [
"accessibility_features.json",
"accessibility_private.json",
"activity_log_private.json",
"autofill_private.idl",
"automation.idl",
"automation_internal.idl",
"autotest_private.idl",
"bluetooth_low_energy.idl",
"bookmark_manager_private.json",
"bookmarks.json",
"braille_display_private.idl",
"browser.idl",
"chrome_web_view_internal.json",
"cloud_print_private.json",
"command_line_private.json",
"content_settings.json",
"context_menus_internal.json",
"context_menus.json",
"cookies.json",
"cryptotoken_private.idl",
"dashboard_private.json",
"data_reduction_proxy.json",
"debugger.json",
"desktop_capture.json",
"developer_private.idl",
"dial.idl",
"downloads.idl",
"downloads_internal.idl",
"easy_unlock_private.idl",
"experience_sampling_private.json",
"feedback_private.idl",
"file_system.idl",
"font_settings.json",
"gcm.json",
"history.json",
"hotword_private.idl",
"i18n.json",
"identity.idl",
"identity_private.idl",
"image_writer_private.idl",
"inline_install_private.idl",
"instance_id.json",
"language_settings_private.idl",
"manifest_types.json",
"media_galleries.idl",
"metrics_private.json",
"notification_provider.idl",
"notifications.idl",
"omnibox.json",
"page_capture.json",
"passwords_private.idl",
"permissions.json",
"preferences_private.json",
"quick_unlock_private.idl",
"resources_private.idl",
"screenlock_private.idl",
"sessions.json",
"settings_private.idl",
"signed_in_devices.idl",
"streams_private.idl",
"sync_file_system.idl",
"system_indicator.idl",
"system_private.json",
"tab_capture.idl",
"tabs.json",
"types.json",
"web_navigation.json",
# Despite the name, this API does not rely on any
# WebRTC-specific bits and as such does not belong in
# the enable_webrtc==0 section below.
"webrtc_audio_private.idl",
"webrtc_desktop_capture_private.idl",
"webrtc_logging_private.idl",
"webstore_private.json",
"webstore_widget_private.idl",
"windows.json",
]
if (enable_task_manager) {
schema_sources += [ "processes.idl" ]
}
if (is_chromeos) {
schema_sources += [
"cast_devices_private.idl",
"certificate_provider.idl",
"certificate_provider_internal.idl",
"echo_private.json",
"enterprise_device_attributes.idl",
"enterprise_platform_keys.idl",
"enterprise_platform_keys_internal.idl",
"enterprise_platform_keys_private.json",
"file_browser_handler_internal.json",
"file_manager_private.idl",
"file_manager_private_internal.idl",
"file_system_provider.idl",
"file_system_provider_internal.idl",
"first_run_private.json",
"input_ime.json",
"input_method_private.json",
"launcher_search_provider.idl",
"log_private.idl",
"platform_keys.idl",
"platform_keys_internal.idl",
"terminal_private.json",
"users_private.idl",
"wallpaper.json",
"wallpaper_private.json",
]
} else if (is_linux || is_win) {
schema_sources += [ "input_ime.json" ]
}
if (enable_service_discovery) {
schema_sources += [
"gcd_private.idl",
"mdns.idl",
]
}
if (enable_webrtc) {
schema_sources += [
"cast_streaming_receiver_session.idl",
"cast_streaming_rtp_stream.idl",
"cast_streaming_session.idl",
"cast_streaming_udp_transport.idl",
]
}
if (enable_app_list) {
schema_sources += [
# TODO(tapted): Move this into chromeos_schema_files.
"launcher_page.idl",
]
}
extensions_api_root_namespace = "extensions::api::%(namespace)s"
extensions_api_uncompiled_sources = [
"browsing_data.json",
"extension.json",
"idltest.idl",
"music_manager_private.idl",
"top_sites.json",
]
if (is_chromeos) {
extensions_api_uncompiled_sources += [
"chromeos_info_private.json",
"media_player_private.json",
]
}
extensions_api_schema_include_rules =
"extensions/common/api:extensions::api::%(namespace)s"
# GYP version: chrome/common/extensions/api/api.gyp:chrome_api # GYP version: chrome/common/extensions/api/api.gyp:chrome_api
json_schema_api("api") { json_schema_api("api") {
sources = schema_sources sources = schema_sources
...@@ -15,8 +169,36 @@ json_schema_api("api") { ...@@ -15,8 +169,36 @@ json_schema_api("api") {
bundle = true bundle = true
configs = [ "//build/config:precompiled_headers" ] configs = [ "//build/config:precompiled_headers" ]
bundle_name = "Chrome" bundle_name = "Chrome"
schema_include_rules = extensions_api_schema_include_rules
uncompiled_bundle_schema_sources = [
"app.json",
"browser_action.json",
"commands.json",
"declarative_content.json",
"file_browser_handler.json",
"page_action.json",
"privacy.json",
"proxy.json",
"tts_engine.json",
"tts.json",
"types_private.json",
"webstore.json",
]
if (!is_chromeos) {
# On ChromeOS, input_method_private is fully compiled (as part of
# schema_files), and so gets added to the bundle already. On other
# platforms, we still need it added to the bundle.
# TODO(devlin): That's weird. Investigate.
uncompiled_bundle_schema_sources += [ "input_method_private.json" ]
}
uncompiled_sources = extensions_api_uncompiled_sources
deps = schema_dependencies root_namespace = extensions_api_root_namespace
deps = [
"//extensions/common/api",
]
} }
# GYP version: chrome/browser/extensions/api/api.gyp:chrome_api_registration # GYP version: chrome/browser/extensions/api/api.gyp:chrome_api_registration
...@@ -26,6 +208,10 @@ json_schema_api("api_registration") { ...@@ -26,6 +208,10 @@ json_schema_api("api_registration") {
bundle_registration = true bundle_registration = true
configs = [ "//build/config:precompiled_headers" ] configs = [ "//build/config:precompiled_headers" ]
bundle_name = "Chrome" bundle_name = "Chrome"
root_namespace = extensions_api_root_namespace
schema_include_rules = extensions_api_schema_include_rules
uncompiled_sources = extensions_api_uncompiled_sources
deps = [ deps = [
# Different APIs include headers from these targets. # Different APIs include headers from these targets.
...@@ -44,7 +230,7 @@ json_schema_api("api_registration") { ...@@ -44,7 +230,7 @@ json_schema_api("api_registration") {
if (is_chromeos) { if (is_chromeos) {
deps += [ "//components/drive:proto" ] deps += [ "//components/drive:proto" ]
} }
deps += schema_dependencies deps += [ "//extensions/common/api" ]
} }
json_features("api_features") { json_features("api_features") {
......
chrome/common/extensions/api/schemas.gni deleted 100644 → 0
View file @ 227d9305
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/features.gni")
import("//build/config/ui.gni")
assert(enable_extensions)
gypi_values = exec_script("//build/gypi_to_gn.py",
[ rebase_path("schemas.gypi") ],
"scope",
[ "schemas.gypi" ])
# Common sources that are both bundled and compiled.
schema_sources = gypi_values.main_schema_files
if (enable_task_manager) {
schema_sources += gypi_values.task_manager_dependent_schema_files
}
if (is_chromeos) {
schema_sources += gypi_values.chromeos_schema_files
} else if (is_linux || is_win) {
schema_sources += gypi_values.input_ime_schema_file
}
if (enable_service_discovery) {
schema_sources += gypi_values.service_discovery_schema_files
}
if (enable_webrtc) {
schema_sources += gypi_values.webrtc_schema_files
}
if (enable_app_list) {
schema_sources += gypi_values.app_list_schema_files
}
uncompiled_sources = gypi_values.main_non_compiled_schema_files
if (is_chromeos) {
uncompiled_sources += gypi_values.chromeos_non_compiled_schema_files
}
uncompiled_bundle_schema_sources = gypi_values.non_compiled_bundle_schema_files
if (!is_chromeos) {
uncompiled_bundle_schema_sources +=
gypi_values.non_chromeos_non_compiled_bundle_schema_files
}
root_namespace = "extensions::api::%(namespace)s"
schema_include_rules = "extensions/common/api:extensions::api::%(namespace)s"
schema_dependencies = [ "//extensions/common/api" ]
chrome/common/extensions/api/schemas.gypi deleted 100644 → 0
View file @ 227d9305
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'sources': [
'<@(schema_files)',
],
'variables': {
'main_schema_files': [
'accessibility_features.json',
'accessibility_private.json',
'activity_log_private.json',
'autofill_private.idl',
'automation.idl',
'automation_internal.idl',
'autotest_private.idl',
'bluetooth_low_energy.idl',
'bookmark_manager_private.json',
'bookmarks.json',
'braille_display_private.idl',
'browser.idl',
'chrome_web_view_internal.json',
'cloud_print_private.json',
'command_line_private.json',
'content_settings.json',
'context_menus_internal.json',
'context_menus.json',
'cookies.json',
'cryptotoken_private.idl',
'dashboard_private.json',
'data_reduction_proxy.json',
'debugger.json',
'desktop_capture.json',
'developer_private.idl',
'dial.idl',
'downloads.idl',
'downloads_internal.idl',
'easy_unlock_private.idl',
'experience_sampling_private.json',
'feedback_private.idl',
'file_system.idl',
'font_settings.json',
'gcm.json',
'history.json',
'hotword_private.idl',
'i18n.json',
'identity.idl',
'identity_private.idl',
'image_writer_private.idl',
'inline_install_private.idl',
'instance_id.json',
'language_settings_private.idl',
'manifest_types.json',
'media_galleries.idl',
'metrics_private.json',
'notification_provider.idl',
'notifications.idl',
'omnibox.json',
'page_capture.json',
'passwords_private.idl',
'permissions.json',
'preferences_private.json',
'quick_unlock_private.idl',
'resources_private.idl',
'screenlock_private.idl',
'sessions.json',
'settings_private.idl',
'signed_in_devices.idl',
'streams_private.idl',
'sync_file_system.idl',
'system_indicator.idl',
'system_private.json',
'tab_capture.idl',
'tabs.json',
'types.json',
'web_navigation.json',
# Despite the name, this API does not rely on any
# WebRTC-specific bits and as such does not belong in
# the enable_webrtc==0 section below.
'webrtc_audio_private.idl',
'webrtc_desktop_capture_private.idl',
'webrtc_logging_private.idl',
'webstore_private.json',
'webstore_widget_private.idl',
'windows.json',
],
'main_schema_include_rules': [
'extensions/common/api:extensions::api::%(namespace)s',
],
'main_non_compiled_schema_files': [
'browsing_data.json',
'extension.json',
'idltest.idl',
'music_manager_private.idl',
'top_sites.json',
],
# ChromeOS-specific schemas.
'chromeos_schema_files': [
'cast_devices_private.idl',
'certificate_provider.idl',
'certificate_provider_internal.idl',
'echo_private.json',
'enterprise_device_attributes.idl',
'enterprise_platform_keys.idl',
'enterprise_platform_keys_internal.idl',
'enterprise_platform_keys_private.json',
'file_browser_handler_internal.json',
'file_manager_private.idl',
'file_manager_private_internal.idl',
'file_system_provider.idl',
'file_system_provider_internal.idl',
'first_run_private.json',
'input_ime.json',
'input_method_private.json',
'launcher_search_provider.idl',
'log_private.idl',
'platform_keys.idl',
'platform_keys_internal.idl',
'terminal_private.json',
'users_private.idl',
'wallpaper.json',
'wallpaper_private.json',
],
'chromeos_non_compiled_schema_files': [
'chromeos_info_private.json',
'media_player_private.json',
],
'service_discovery_schema_files': [
'gcd_private.idl',
'mdns.idl',
],
'webrtc_schema_files': [
'cast_streaming_receiver_session.idl',
'cast_streaming_rtp_stream.idl',
'cast_streaming_session.idl',
'cast_streaming_udp_transport.idl',
],
'app_list_schema_files': [
# TODO(tapted): Move this into chromeos_schema_files.
'launcher_page.idl',
],
'task_manager_dependent_schema_files': [
'processes.idl',
],
# Input IME schema.
'input_ime_schema_file': [
'input_ime.json',
],
'non_compiled_schema_files': [
'<@(main_non_compiled_schema_files)',
],
'non_compiled_bundle_schema_files': [
'app.json',
'browser_action.json',
'commands.json',
'declarative_content.json',
'file_browser_handler.json',
'page_action.json',
'privacy.json',
'proxy.json',
'tts_engine.json',
'tts.json',
'types_private.json',
'webstore.json',
],
# On ChromeOS, input_method_private is fully compiled (as part of
# schema_files), and so gets added to the bundle already. On other
# platforms, we still need it added to the bundle.
# TODO(devlin): That's weird. Investigate.
'non_chromeos_non_compiled_bundle_schema_files': [
'input_method_private.json',
],
'schema_dependencies': [
'<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
],
'schema_files': [
'<@(main_schema_files)',
],
'schema_include_rules': [
'<@(main_schema_include_rules)',
],
'chromium_code': 1,
# Disable schema compiler to generate model extension API code.
# Only register the extension functions in extension system.
'conditions': [
['enable_task_manager==1', {
'schema_files': [
'<@(task_manager_dependent_schema_files)',
],
}],
['chromeos==1', {
'schema_files': [
'<@(chromeos_schema_files)',
],
'non_compiled_schema_files': [
'<@(chromeos_non_compiled_schema_files)',
],
}, { # chromeos==0
'conditions': [
['OS=="linux" or OS=="win"', {
'schema_files': [
'<@(input_ime_schema_file)',
],
}],
],
}],
['enable_service_discovery==1', {
'schema_files': [
'<@(service_discovery_schema_files)',
],
}],
['enable_webrtc==1', {
'schema_files': [
'<@(webrtc_schema_files)',
],
}],
['enable_app_list==1', {
'schema_files': [
'<@(app_list_schema_files)',
],
}],
],
'cc_dir': 'chrome/common/extensions/api',
'root_namespace': 'extensions::api::%(namespace)s',
'bundle_name': 'Chrome',
'impl_dir_': 'chrome/browser/extensions/api',
},
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment