diff options
| author | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-06 03:29:33 +0000 |
|---|---|---|
| committer | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-06 03:29:33 +0000 |
| commit | 7c6a8e6cc2688092cb47b5e1d6b7ad0458db9a4d (patch) | |
| tree | 0cfdda328628ff7a9023a44b9473d7fdb6e83592 /chrome/chrome_exe.gypi | |
| parent | 9552c2ddb6c18e9c12c3ffad8607e4478362c30c (diff) | |
| download | chromium_src-7c6a8e6cc2688092cb47b5e1d6b7ad0458db9a4d.zip chromium_src-7c6a8e6cc2688092cb47b5e1d6b7ad0458db9a4d.tar.gz chromium_src-7c6a8e6cc2688092cb47b5e1d6b7ad0458db9a4d.tar.bz2 | |
Revert of https://codereview.chromium.org/109483003/
Reason for revert: Breaking WIN tests on waterfall
TBR=robertshield@chromium.org,siggi@chromium.org
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/114333008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 0c1f678..f694ae0 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -41,12 +41,6 @@ 'INFOPLIST_FILE': 'app/app-Info.plist', }, 'conditions': [ - ['OS == "win" ', { - 'dependencies': [ - # Note that chrome_elf must be listed first. Do not reorder it. - '../chrome_elf/chrome_elf.gyp:chrome_elf', - ], - }], ['component == "shared_library"', { 'variables': { 'win_use_external_manifest': 1, @@ -474,6 +468,8 @@ }], ['OS=="win"', { 'dependencies': [ + # Note that chrome_elf must be listed first. Do not reorder it. + '../chrome_elf/chrome_elf.gyp:chrome_elf', 'chrome_dll', 'chrome_nacl_win64', 'chrome_process_finder', |