diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 19:17:07 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 19:17:07 +0000 |
| commit | 615fa664ca14392b278777f27eb87a930cbafea1 (patch) | |
| tree | bcc9c5ecfadf44c6a513c68487af3c7d1b86615f /build/common.gypi | |
| parent | 24ddd0a46ab2a72dc1e3cdec3626f67952a37641 (diff) | |
| download | chromium_src-615fa664ca14392b278777f27eb87a930cbafea1.zip chromium_src-615fa664ca14392b278777f27eb87a930cbafea1.tar.gz chromium_src-615fa664ca14392b278777f27eb87a930cbafea1.tar.bz2 | |
Second attempt at fixing Ninja build for Android and change make for host os optionally use goma
Now, to build with goma, you must:
1) Set $GOMA_DIR
2) Specify Goma in the path such as:
PATH=$GOMA_DIR/android/:$PATH ninja -j250 -C out/Release base_unittests_apk
"2)" above is necessary temporarily until the *_target variables are removed from build/android/envsetup.sh
Review URL: https://chromiumcodereview.appspot.com/10834296
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4165e19..4a973e1 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3330,16 +3330,16 @@ ['LINK.host', '$(LINK)'], ], }], - ['OS=="android" and clang==0 and "<(GENERATOR)"!="ninja"', { + ['OS=="android" and clang==0', { # Hardcode the compiler names in the Makefile so that # it won't depend on the environment at make time. 'make_global_settings': [ ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'], ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'], ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'], - ['CC.host', '<!(which gcc)'], - ['CXX.host', '<!(which g++)'], - ['LINK.host', '<!(which g++)'], + ['CC.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which gcc))'], + ['CXX.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'], + ['LINK.host', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} <!(which g++))'], ], }], ], |