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

Unified Diff: ui/aura_shell/aura_shell.gyp

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 | « ui/aura/aura.gyp ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura_shell/aura_shell.gyp
===================================================================
--- ui/aura_shell/aura_shell.gyp (revision 107983)
+++ ui/aura_shell/aura_shell.gyp (working copy)
@@ -80,7 +80,6 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:test_support_base',
- '../../chrome/chrome_resources.gyp:packed_resources',
'../../build/temp_gyp/googleurl.gyp:googleurl',
'../../skia/skia.gyp:skia',
'../../testing/gtest.gyp:gtest',
@@ -111,6 +110,13 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
+ 'conditions': [
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
+ ],
},
{
'target_name': 'aura_shell_exe',
@@ -118,7 +124,6 @@
'dependencies': [
'../../base/base.gyp:base',
'../../base/base.gyp:base_i18n',
- '../../chrome/chrome_resources.gyp:packed_resources',
'../../skia/skia.gyp:skia',
'../../third_party/icu/icu.gyp:icui18n',
'../../third_party/icu/icu.gyp:icuuc',
@@ -146,6 +151,13 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',
],
+ 'conditions': [
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
+ ],
},
# It's convenient for aura_shell developers to be able to build all
# compositor and aura targets from within this solution.
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/gfx/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698