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

Unified Diff: chrome/common/extensions/api/schemas.gypi

Issue 513633002: Reland 596ff54335b2a1b393af10657bc4945114f3beed - Split API bundle generation steps (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 6 years, 4 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/common/extensions/api/schemas.gni ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/api/schemas.gypi
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/schemas.gypi
similarity index 60%
copy from chrome/common/extensions/api/api.gyp
copy to chrome/common/extensions/api/schemas.gypi
index ef1a2c5f5515b187ea4e931821829f966e268615..41134e99eac8c7c648635ba086646dd2aa5b10ea 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/schemas.gypi
@@ -1,16 +1,11 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# 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.
{
- # All files are stored in these lists which are referenced in the target
- # below so that the GN build of this target can read in this dictionary and
- # duplicate the same logic without the lists getting out-of-sync. The GN
- # .gypi reader can not process conditions and does not know about targets,
- # etc., it just reads Python dictionaries.
- #
- # If you add a new category, also add it to the BUILD.gn file in this
- # directory.
+ 'sources': [
+ '<@(schema_files)',
+ ],
'variables': {
# These duplicate other lists and are the only ones used on Android. They
# should be eliminated. See crbug.com/305852.
@@ -156,77 +151,44 @@
'cast_streaming_session.idl',
'cast_streaming_udp_transport.idl',
],
- },
- 'targets': [
- {
- # GN version: //chrome/common/extensions/api:api
- 'target_name': 'chrome_api',
- 'type': 'static_library',
- 'sources': [
- '<@(schema_files)',
- ],
- # TODO(jschuh): http://crbug.com/167187 size_t -> int
- 'msvs_disabled_warnings': [ 4267 ],
- 'includes': [
- '../../../../build/json_schema_bundle_compile.gypi',
- '../../../../build/json_schema_compile.gypi',
- ],
- 'variables': {
- 'chromium_code': 1,
- # Disable schema compiler to generate model extension API code.
- # Only register the extension functions in extension system.
- 'conditions': [
- ['enable_extensions==1', {
- 'non_compiled_schema_files': [
- '<@(main_non_compiled_schema_files)',
- ],
- 'schema_files': [
- '<@(main_schema_files)',
- ],
- }, { # enable_extensions==0
- 'non_compiled_schema_files': [
- ],
- 'schema_files': [
- # These should be eliminated. See crbug.com/305852.
- '<@(android_schema_files)',
- ],
- }],
- ['chromeos==1', {
- 'schema_files': [
- '<@(chromeos_schema_files)',
- ],
- }],
- ['enable_extensions==1 and enable_webrtc==1', {
- 'schema_files': [
- '<@(webrtc_schema_files)',
- ],
- }],
- ['branding=="Chrome" and chromeos==1', {
- 'schema_files': [
- '<@(chromeos_branded_schema_files)',
- ],
- }],
- ],
- 'cc_dir': 'chrome/common/extensions/api',
- 'root_namespace': 'extensions::api::%(namespace)s',
- },
- 'dependencies': [
- # Different APIs include some headers from chrome/common that in turn
- # include generated headers from these targets.
- # TODO(brettw) this should be made unnecessary if possible.
- '<(DEPTH)/components/components.gyp:component_metrics_proto',
- '<(DEPTH)/content/content.gyp:content_browser',
- '<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/sync/sync.gyp:sync',
- ],
- 'conditions': [
- ['chromeos==1', {
- 'dependencies': [
- '<(DEPTH)/chrome/chrome.gyp:drive_proto',
- ],
- }],
- ],
- },
- ],
+ 'chromium_code': 1,
+ # Disable schema compiler to generate model extension API code.
+ # Only register the extension functions in extension system.
+ 'conditions': [
+ ['enable_extensions==1', {
+ 'non_compiled_schema_files': [
+ '<@(main_non_compiled_schema_files)',
+ ],
+ 'schema_files': [
+ '<@(main_schema_files)',
+ ],
+ }, { # enable_extensions==0
+ 'non_compiled_schema_files': [
+ ],
+ 'schema_files': [
+ # These should be eliminated. See crbug.com/305852.
+ '<@(android_schema_files)',
+ ],
+ }],
+ ['chromeos==1', {
+ 'schema_files': [
+ '<@(chromeos_schema_files)',
+ ],
+ }],
+ ['enable_extensions==1 and enable_webrtc==1', {
+ 'schema_files': [
+ '<@(webrtc_schema_files)',
+ ],
+ }],
+ ['branding=="Chrome" and chromeos==1', {
+ 'schema_files': [
+ '<@(chromeos_branded_schema_files)',
+ ],
+ }],
+ ],
+ 'cc_dir': 'chrome/common/extensions/api',
+ 'root_namespace': 'extensions::api::%(namespace)s',
+ 'impl_dir_': 'chrome/browser/extensions/api',
+ },
}
« no previous file with comments | « chrome/common/extensions/api/schemas.gni ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698