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

Unified Diff: views/views.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/gfx/compositor/compositor.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
===================================================================
--- views/views.gyp (revision 107983)
+++ views/views.gyp (working copy)
@@ -1,6 +1,7 @@
# Copyright (c) 2011 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+
{
'variables': {
'chromium_code': 1,
@@ -549,10 +550,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_base',
- # TODO(jcivelli): ideally the resource needed by views would be
- # factored out. (for some reason it pulls in a bunch
- # unrelated things like v8, sqlite nss...).
- '../chrome/chrome_resources.gyp:packed_resources',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
@@ -668,6 +665,14 @@
['exclude', '../ui/aura/test/test_desktop_delegate.h'],
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ # TODO(jcivelli): ideally the resource needed by views would be
+ # factored out. (for some reason it pulls in a bunch
+ # unrelated things like v8, sqlite nss...).
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
{
@@ -676,7 +681,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',
@@ -776,6 +780,11 @@
'examples/table_example.h',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
{
@@ -783,7 +792,6 @@
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
- '../chrome/chrome_resources.gyp:packed_resources',
'../skia/skia.gyp:skia',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -829,6 +837,11 @@
'../third_party/wtl/include',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
{
@@ -837,7 +850,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',
@@ -890,6 +902,11 @@
'../third_party/wtl/include',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
],
@@ -902,7 +919,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',
@@ -934,6 +950,11 @@
'../third_party/wtl/include',
],
}],
+ ['OS!="mac"', {
+ 'dependencies': [
+ '../chrome/chrome.gyp:packed_resources',
+ ],
+ }],
],
},
],
« no previous file with comments | « ui/gfx/compositor/compositor.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698