diff options
| author | macourteau <macourteau@chromium.org> | 2015-10-08 10:53:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-08 17:54:37 +0000 |
| commit | 01c3402f3319c93b2defc579e9280e22b606f839 (patch) | |
| tree | 27a840e420781af980d784f87eb3a17f2ba4efd4 /build/all.gyp | |
| parent | 91c090ed47b787d3271c3a8ac725d1b2003bd847 (diff) | |
| download | chromium_src-01c3402f3319c93b2defc579e9280e22b606f839.zip chromium_src-01c3402f3319c93b2defc579e9280e22b606f839.tar.gz chromium_src-01c3402f3319c93b2defc579e9280e22b606f839.tar.bz2 | |
Revert of Make both_gn_and_gyp compile on Android (patchset #5 id:280001 of https://codereview.chromium.org/1389593002/ )
Reason for revert:
Tentatively reverting due to Android failure (http://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%209%29/builds/3047/steps/compile/logs/stdio)
Original issue's description:
> Make both_gn_and_gyp compile on Android
>
> BUG=504082
>
> Committed: https://crrev.com/3378c1399bfc537c590e8b79e51434256ffad741
> Cr-Commit-Position: refs/heads/master@{#353082}
TBR=dpranke@chromium.org,pkotwicz@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=504082
Review URL: https://codereview.chromium.org/1399513003
Cr-Commit-Position: refs/heads/master@{#353085}
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index a0c9bba..dde5e32 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -497,7 +497,7 @@ ], 'conditions': [ # TODO(GYP): make gn_migration.gypi work unconditionally. - ['OS=="mac" or OS=="win" or (OS=="android" and chromecast==0) or (OS=="linux" and target_arch=="x64" and chromecast==0)', { + ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch=="x64" and chromecast==0)', { 'includes': [ 'gn_migration.gypi', ], |