diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 13:32:22 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-11 13:32:22 +0000 |
| commit | ef36c74c2e00d7559fd30eda9b7264e2777bb5fe (patch) | |
| tree | 3b72bcd66671ffd030e013db852d5162e531eb34 /chrome/chrome.gyp | |
| parent | 03066d1ea3e15d710f2ee87b18b790567498cdd7 (diff) | |
| download | chromium_src-ef36c74c2e00d7559fd30eda9b7264e2777bb5fe.zip chromium_src-ef36c74c2e00d7559fd30eda9b7264e2777bb5fe.tar.gz chromium_src-ef36c74c2e00d7559fd30eda9b7264e2777bb5fe.tar.bz2 | |
net_resources unfork
- bring the rules for grit all in align for common style/dir names.
- make the mac build net:net_resource (was win/linux only)
- ripple the mac dep upstream
- merge net_resource into the chrome repack
more work is needed on the mac side, we aren't really using the new resources
yet, but this is a clean landing point.
Review URL: http://codereview.chromium.org/45001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 61a3360..c4431e2 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -334,6 +334,7 @@ 'common', 'resources', '../media/media.gyp:media', + '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', '../third_party/icu38/icu38.gyp:icui18n', '../third_party/icu38/icu38.gyp:icuuc', @@ -1164,9 +1165,6 @@ ], 'conditions': [ ['OS=="linux"', { - 'dependencies': [ - '../net/net.gyp:net_resources', - ], 'sources!': [ # TODO(port): Port these. 'browser/debugger/debugger_contents.cc', @@ -1205,7 +1203,6 @@ 'third_party/wtl/include', ], 'dependencies': [ - '../net/net.gyp:net_resources', '../google_update/google_update.gyp:google_update', 'installer/util/util.gyp:installer_util', '../printing/printing.gyp:printing', @@ -1503,6 +1500,7 @@ '<(SHARED_INTERMEDIATE_DIR)/chrome/debugger_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', ], }, @@ -1969,10 +1967,10 @@ ], }, ], - # On Mac only, add a project target called "package_app" that only - # runs a shell script (package_chrome.sh). 'conditions': [ ['OS=="mac"', + # On Mac only, add a project target called "package_app" that only + # runs a shell script (package_chrome.sh). { 'targets': [ { 'target_name': 'package_app', @@ -2251,6 +2249,6 @@ }, }, ]}, # 'targets' - ], # OS=="mac" + ], # OS=="win" ], # 'conditions' } |