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

Unified Diff: views/views.gyp

Issue 8425002: Introduces chromium_resources.gyp to factor out Chrome resource generation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux psuedo_locales output dir. Created 9 years, 1 month 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
diff --git a/views/views.gyp b/views/views.gyp
index b8082a4145ec620447dc4a2ae965b25d9b1ddcc5..825ef6b186f1c662f3fe9a2a1bd2a3bd8d7685a5 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -1,7 +1,6 @@
# 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,
@@ -550,6 +549,10 @@
'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',
@@ -664,14 +667,6 @@
['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',
- ],
- }],
],
},
{
@@ -680,6 +675,7 @@
'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',
@@ -779,11 +775,6 @@
'examples/table_example.h',
],
}],
- ['OS!="mac"', {
- 'dependencies': [
- '../chrome/chrome.gyp:packed_resources',
- ],
- }],
],
},
{
@@ -791,6 +782,7 @@
'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',
@@ -836,11 +828,6 @@
'../third_party/wtl/include',
],
}],
- ['OS!="mac"', {
- 'dependencies': [
- '../chrome/chrome.gyp:packed_resources',
- ],
- }],
],
},
{
@@ -849,6 +836,7 @@
'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',
@@ -901,11 +889,6 @@
'../third_party/wtl/include',
],
}],
- ['OS!="mac"', {
- 'dependencies': [
- '../chrome/chrome.gyp:packed_resources',
- ],
- }],
],
},
],
@@ -918,6 +901,7 @@
'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',
@@ -949,11 +933,6 @@
'../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