From adf6b2e17687fc42a548898fb27347e74cb73918 Mon Sep 17 00:00:00 2001 From: "dhollowa@chromium.org" Date: Thu, 3 Nov 2011 15:32:12 +0000 Subject: Revert 108466 - Introduces chromium_resources.gyp to factor out Chrome resource generation 1. Factors out Chrome/Chromium resource generation into a separate chrome_resources.gyp file. 2. Eliminates repetition between Mac and other platforms. 3. Breaks long "repack" actions out into separate files for greater readability. 4. Eliminates circular dependencies in the Aura shell, the Views components, and the compositor when utilizing Chrome resources. BUG=none TEST=try bots run gyps and build correctly. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=107967 Review URL: http://codereview.chromium.org/8425002 TBR=dhollowa@chromium.org Review URL: http://codereview.chromium.org/8448001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108468 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_frame.gyp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome_frame') diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index a37209a..826510c 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -34,10 +34,10 @@ ], 'target_defaults': { 'dependencies': [ - '../chrome/chrome_resources.gyp:chrome_resources', - '../chrome/chrome_resources.gyp:chrome_strings', - '../chrome/chrome_resources.gyp:packed_resources', - '../chrome/chrome_resources.gyp:theme_resources', + '../chrome/chrome.gyp:chrome_resources', + '../chrome/chrome.gyp:chrome_strings', + '../chrome/chrome.gyp:packed_resources', + '../chrome/chrome.gyp:theme_resources', '../skia/skia.gyp:skia', ], 'defines': [ 'ISOLATION_AWARE_ENABLED=1' ], @@ -376,10 +376,10 @@ 'dependencies': [ '../base/base.gyp:test_support_base', '../chrome/chrome.gyp:browser', + '../chrome/chrome.gyp:chrome_resources', '../chrome/chrome.gyp:debugger', '../chrome/chrome.gyp:renderer', '../chrome/chrome.gyp:syncapi_core', - '../chrome/chrome_resources.gyp:chrome_resources', '../content/content.gyp:content_gpu', '../net/net.gyp:net', '../net/net.gyp:net_test_support', -- cgit v1.1