diff options
| author | pkotwicz <pkotwicz@chromium.org> | 2015-10-15 11:07:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-15 18:08:14 +0000 |
| commit | 11f0177394eedc116c54e786d65b8c5dc7d72440 (patch) | |
| tree | 35734b241350c0fc4e7c51edd3a655bee08a7187 /build/all.gyp | |
| parent | a9daf22e6c22c653ae88e3255894a3b253ccd2cd (diff) | |
| download | chromium_src-11f0177394eedc116c54e786d65b8c5dc7d72440.zip chromium_src-11f0177394eedc116c54e786d65b8c5dc7d72440.tar.gz chromium_src-11f0177394eedc116c54e786d65b8c5dc7d72440.tar.bz2 | |
Attempt #3: Make both_gn_and_gyp compile on Android
BUG=504082
Review URL: https://codereview.chromium.org/1407723003
Cr-Commit-Position: refs/heads/master@{#354303}
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 8eabf88..c87fc2d 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -498,7 +498,7 @@ ], 'conditions': [ # TODO(GYP): make gn_migration.gypi work unconditionally. - ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch=="x64" and chromecast==0)', { + ['OS=="mac" or OS=="win" or (OS=="android" and chromecast==0) or (OS=="linux" and target_arch=="x64" and chromecast==0)', { 'includes': [ 'gn_migration.gypi', ], |