diff options
| author | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 00:14:37 +0000 |
|---|---|---|
| committer | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 00:14:37 +0000 |
| commit | f9e52b4c6e147209fa625bdd6fc1ce781aa0f912 (patch) | |
| tree | f2dc9220cf42cc650a2b65ef40bd052c55114eb3 /build/all.gyp | |
| parent | 065105cae3aad43ce57b7625da68d23f8e762f6b (diff) | |
| download | chromium_src-f9e52b4c6e147209fa625bdd6fc1ce781aa0f912.zip chromium_src-f9e52b4c6e147209fa625bdd6fc1ce781aa0f912.tar.gz chromium_src-f9e52b4c6e147209fa625bdd6fc1ce781aa0f912.tar.bz2 | |
Revert 261559 "Create new app_shell.gyp for app_shell targets."
> Create new app_shell.gyp for app_shell targets.
>
> This moves app_shell GYP entries from a chrome.gyp include into
> a new apps/shell/app_shell.gyp.
>
> It also breaks down dependencies with more granularity and separates
> temporary, undesirable app_shell_lib dependencies from acceptable ones.
>
> BUG=359678
> TBR=yoz@chromium.org for extensions.gyp
>
> Review URL: https://codereview.chromium.org/223613005
TBR=rockot@chromium.org
Review URL: https://codereview.chromium.org/224963002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/build/all.gyp b/build/all.gyp index 0c875cc..1b9d5fe7 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -223,11 +223,6 @@ '../google_apis/gcm/gcm.gyp:*', ], }], - ['chromeos==1 or (OS=="linux" and use_aura==1) or (OS=="win" and use_aura==1)', { - 'dependencies': [ - '../apps/shell/app_shell.gyp:*', - ], - }], ], }, # target_name: All { |