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

Unified Diff: apps/shell/app_shell.gyp

Issue 246423002: Split feature definitions into extensions and chrome features. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: repack2 Created 6 years, 8 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 | « apps/shell/DEPS ('k') | apps/shell/common/shell_extensions_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/app_shell.gyp
diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp
index b8f394ade90f11580ac0a6727b88798ff3f8a987..720de6a0f2f03f9971bece5cde194462caeabfae 100644
--- a/apps/shell/app_shell.gyp
+++ b/apps/shell/app_shell.gyp
@@ -20,6 +20,7 @@
# devtools_resources.pak.
'<(DEPTH)/content/content_shell_and_tests.gyp:generate_content_shell_resources',
'<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources',
+ '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
],
@@ -37,6 +38,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
@@ -59,6 +61,7 @@
'<(DEPTH)/chrome/chrome.gyp:plugin',
'<(DEPTH)/chrome/chrome.gyp:renderer',
'<(DEPTH)/chrome/chrome.gyp:utility',
+ '<(DEPTH)/chrome/chrome_resources.gyp:chrome_resources',
'<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
'<(DEPTH)/third_party/WebKit/public/blink_devtools.gyp:blink_devtools_frontend_resources',
# TODO(rockot): Dependencies above this line are temporary.
@@ -75,6 +78,7 @@
'<(DEPTH)/extensions/extensions.gyp:extensions_browser',
'<(DEPTH)/extensions/extensions.gyp:extensions_common',
'<(DEPTH)/extensions/extensions.gyp:extensions_renderer',
+ '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
'<(DEPTH)/ui/wm/wm.gyp:wm',
« no previous file with comments | « apps/shell/DEPS ('k') | apps/shell/common/shell_extensions_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698