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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.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_resources.gyp ('k') | chrome/nacl.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi (revision 107983)
+++ chrome/chrome_tests.gypi (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' : {
'pyautolib_sources': [
@@ -33,17 +34,17 @@
'target_name': 'test_support_common',
'type': 'static_library',
'dependencies': [
- 'app/policy/cloud_policy_codegen.gyp:policy',
'browser',
- 'browser/sync/protocol/sync_proto.gyp:sync_proto',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'chrome_resources.gyp:theme_resources',
'common',
+ 'renderer',
'plugin',
- 'renderer',
'service',
'utility',
+ 'chrome_resources',
+ 'chrome_strings',
+ 'app/policy/cloud_policy_codegen.gyp:policy',
+ 'browser/sync/protocol/sync_proto.gyp:sync_proto',
+ 'theme_resources',
'../base/base.gyp:test_support_base',
'../content/content.gyp:content_app',
'../content/content.gyp:content_gpu',
@@ -265,10 +266,10 @@
'target_name': 'test_support_ui',
'type': 'static_library',
'dependencies': [
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'chrome_resources.gyp:theme_resources',
'test_support_common',
+ 'chrome_resources',
+ 'chrome_strings',
+ 'theme_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
@@ -398,9 +399,9 @@
'target_name': 'test_support_unit',
'type': 'static_library',
'dependencies': [
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
'test_support_common',
+ 'chrome_resources',
+ 'chrome_strings',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
@@ -427,10 +428,10 @@
'type': 'executable',
'dependencies': [
'browser',
- 'chrome_resources.gyp:theme_resources',
'renderer',
'test_support_common',
'test_support_ui',
+ 'theme_resources',
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
'../third_party/libxml/libxml.gyp:libxml',
@@ -481,8 +482,8 @@
'dependencies': [
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
'debugger',
'syncapi_core',
'test_support_common',
@@ -682,11 +683,11 @@
'target_name': 'ui_tests',
'type': 'executable',
'dependencies': [
+ 'chrome',
'browser',
- 'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
'common',
+ 'chrome_resources',
+ 'chrome_strings',
'test_support_ui',
'../base/base.gyp:base',
'../net/net.gyp:net',
@@ -877,8 +878,8 @@
'dependencies': [
'browser',
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
'chromedriver_support',
'common',
'syncapi_core',
@@ -1121,8 +1122,8 @@
'../ui/ui.gyp:ui_resources_standard',
'../ui/ui.gyp:ui_test_support',
'../v8/tools/gyp/v8.gyp:v8',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
],
'include_dirs': [
'..',
@@ -2156,9 +2157,9 @@
],
}, { # OS != "mac"
'dependencies': [
- 'chrome_resources.gyp:packed_extra_resources',
- 'chrome_resources.gyp:packed_resources',
'convert_dict_lib',
+ 'packed_extra_resources',
+ 'packed_resources',
'../third_party/hunspell/hunspell.gyp:hunspell',
],
'sources!': [
@@ -2281,8 +2282,8 @@
'browser',
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
'renderer',
'test_support_common',
'../base/base.gyp:base',
@@ -2951,9 +2952,9 @@
'dependencies': [
'browser',
'chrome',
- 'chrome_resources.gyp:theme_resources',
'test_support_common',
'test_support_ui',
+ 'theme_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
@@ -3002,8 +3003,8 @@
'type': 'executable',
'dependencies': [
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
'debugger',
'test_support_common',
'test_support_ui',
@@ -3236,8 +3237,8 @@
],
},{ # OS!="mac"
'dependencies': [
- 'chrome_resources.gyp:packed_extra_resources',
- 'chrome_resources.gyp:packed_resources'
+ 'packed_extra_resources',
+ 'packed_resources'
],
}],
['OS=="linux" and chromeos==1', {
@@ -3254,10 +3255,10 @@
'browser',
'browser/sync/protocol/sync_proto.gyp:sync_proto',
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
'common',
'renderer',
+ 'chrome_strings',
'test_support_common',
'../net/net.gyp:net',
'../net/net.gyp:net_test_support',
@@ -3550,8 +3551,8 @@
'dependencies': [
'browser',
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
'renderer',
'test_support_common',
'test_support_ui',
@@ -3658,8 +3659,8 @@
'type': 'executable',
'dependencies': [
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
+ 'chrome_resources',
+ 'chrome_strings',
'test_support_common',
'test_support_ui',
'../skia/skia.gyp:skia',
@@ -3730,10 +3731,10 @@
'type': 'executable',
'dependencies': [
'browser',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
'common',
'renderer',
+ 'chrome_resources',
+ 'chrome_strings',
'../content/content.gyp:content_gpu',
'../content/content.gyp:test_support_content',
'../base/base.gyp:base',
@@ -3859,12 +3860,12 @@
'product_prefix': '_',
'dependencies': [
'chrome',
- 'chrome_resources.gyp:chrome_resources',
- 'chrome_resources.gyp:chrome_strings',
- 'chrome_resources.gyp:theme_resources',
'debugger',
'syncapi_core',
'test_support_common',
+ 'chrome_resources',
+ 'chrome_strings',
+ 'theme_resources',
'../skia/skia.gyp:skia',
'../testing/gtest.gyp:gtest',
],
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/nacl.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698