Index: chrome/common/extensions/api/schemas.gypi |
diff --git a/chrome/common/extensions/api/schemas.gypi b/chrome/common/extensions/api/schemas.gypi |
index 0c42b3f5e35dd94f8251cb434d25a73288b58aca..da77b9005f80f5903e94ed8ed9ca5749c83fcd5a 100644 |
--- a/chrome/common/extensions/api/schemas.gypi |
+++ b/chrome/common/extensions/api/schemas.gypi |
@@ -129,40 +129,29 @@ |
'cast_streaming_udp_transport.idl', |
], |
+ 'non_compiled_schema_files': [ |
+ '<@(main_non_compiled_schema_files)', |
+ ], |
+ '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': [ |
- # TODO(thestig): Remove this file from non-extensions build so the |
- # conditional and else branch goes away. |
- # Do the same for chrome/common/extensions/api/schemas.gni. |
- ['enable_extensions==1', { |
- 'non_compiled_schema_files': [ |
- '<@(main_non_compiled_schema_files)', |
- ], |
- 'schema_dependencies': [ |
- '<(DEPTH)/extensions/common/api/api.gyp:extensions_api', |
- ], |
- 'schema_files': [ |
- '<@(main_schema_files)', |
- ], |
- 'schema_include_rules': [ |
- '<@(main_schema_include_rules)', |
- ], |
- }, { # enable_extensions==0 |
- 'non_compiled_schema_files': [ |
- ], |
- 'schema_dependencies': [ |
- ], |
- 'schema_files': [ |
- ], |
- }], |
['chromeos==1', { |
'schema_files': [ |
'<@(chromeos_schema_files)', |
], |
}], |
- ['enable_extensions==1 and enable_webrtc==1', { |
+ ['enable_webrtc==1', { |
'schema_files': [ |
'<@(webrtc_schema_files)', |
], |