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

Unified Diff: extensions/extensions.gyp

Issue 615913003: extensions: Remove dependencies on Chrome resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/extensions.gyp
diff --git a/extensions/extensions.gyp b/extensions/extensions.gyp
index a8e3bbd878560e7afc3545edebb977b8d1c14e7e..ec08649f2d6f1f049ee5b5f0516d21ea7f34d087 100644
--- a/extensions/extensions.gyp
+++ b/extensions/extensions.gyp
@@ -12,10 +12,6 @@
'target_name': 'extensions_common',
'type': 'static_library',
'dependencies': [
- # TODO(benwells): figure out what to do with the api target and
- # api resources compiled into the chrome resource bundle.
- # http://crbug.com/162530
- '../chrome/chrome_resources.gyp:chrome_resources',
'../components/components.gyp:crx_file',
'../components/components.gyp:url_matcher',
'../content/content.gyp:content_common',
@@ -297,8 +293,6 @@
'<(INTERMEDIATE_DIR)',
# Needed to access generated API headers.
'<(SHARED_INTERMEDIATE_DIR)',
- # Needed for grit.
- '<(SHARED_INTERMEDIATE_DIR)/chrome',
James Cook 2014/10/02 00:38:01 That it compiles without this bit reassures me.
],
'sources': [
# Note: sources list duplicated in GN build.
@@ -769,7 +763,6 @@
'type': 'static_library',
'dependencies': [
'extensions_resources.gyp:extensions_resources',
- '../chrome/chrome_resources.gyp:chrome_resources',
'../content/content.gyp:content_resources',
'../gin/gin.gyp:gin',
'../mojo/mojo_base.gyp:mojo_js_bindings',
@@ -1000,9 +993,6 @@
'target_name': 'extensions_shell_and_test_pak',
'type': 'none',
'dependencies': [
- # Need extension related resources in common_resources.pak and
- # renderer_resources_100_percent.pak
- '../chrome/chrome_resources.gyp:chrome_resources',
# Need dev-tools related resources in shell_resources.pak and
# devtools_resources.pak.
'../content/browser/devtools/devtools_resources.gyp:devtools_resources',
@@ -1018,12 +1008,6 @@
'action_name': 'repack_extensions_shell_and_test_pak',
'variables': {
'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak',
- # TODO(jamescook): Extract the extension/app related resources
- # from generated_resources_en-US.pak. http://crbug.com/397250
- '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698