diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-24 04:32:18 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-24 04:32:18 +0000 |
| commit | 3f55cf80386618578049cb73aaa094d848f9fba6 (patch) | |
| tree | 18294d2d67637b13b6729090d4ee34096f4ae5f1 /net/net.gyp | |
| parent | 319c9842070164aa0ca74c730601b7b19d16a5b4 (diff) | |
| download | chromium_src-3f55cf80386618578049cb73aaa094d848f9fba6.zip chromium_src-3f55cf80386618578049cb73aaa094d848f9fba6.tar.gz chromium_src-3f55cf80386618578049cb73aaa094d848f9fba6.tar.bz2 | |
android: Fold all_android.gyp into all.gyp.
All other platforms have their targets in all.gyp. Android didn't during
bring-up, but enough stuff works by now that there's no need for the
separate all_android.gyp file any more.
BUG=330631
R=yfriedman@chromium.org
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/139743016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246782 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index bccf777..1293ab2 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -2606,7 +2606,7 @@ }, ], }], - ['OS != "ios"', { + ['OS != "ios" and OS != "android"', { 'targets': [ # iOS doesn't have the concept of simple executables, these targets # can't be compiled on the platform. |