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

Unified Diff: chrome/chrome_common.gypi

Issue 8430011: Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 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/chrome_browser.gypi ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_common.gypi
===================================================================
--- chrome/chrome_common.gypi (revision 107983)
+++ chrome/chrome_common.gypi (working copy)
@@ -23,12 +23,12 @@
# shared with the 64-bit target, but it does not work due to a gyp
# issue.
'app/policy/cloud_policy_codegen.gyp:policy',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'chrome_resources.gyp:theme_resources',
+ 'chrome_resources',
+ 'chrome_strings',
'common_constants',
'common_net',
'default_plugin/default_plugin.gyp:default_plugin',
+ 'theme_resources',
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:base_static',
@@ -262,7 +262,7 @@
'common/native_web_keyboard_event_views.cc',
'common/native_web_keyboard_event_views.h',
],
- }],
+ }],
['use_aura==1', {
'dependencies!': [
'default_plugin/default_plugin.gyp:default_plugin',
@@ -371,8 +371,8 @@
'common/net/x509_certificate_model.h',
],
'dependencies': [
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
'../base/base.gyp:base',
'../crypto/crypto.gyp:crypto',
'../gpu/gpu.gyp:gpu_ipc',
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698