diff options
| -rwxr-xr-x | build/android/envsetup.sh | 6 | ||||
| -rw-r--r-- | build/common.gypi | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh index 6ed168d..7ddd064 100755 --- a/build/android/envsetup.sh +++ b/build/android/envsetup.sh @@ -107,12 +107,12 @@ export PATH=$PATH:${CHROME_SRC}/build/android # Performs a gyp_chromium run to convert gyp->Makefile for android code. android_gyp() { - GOMA_WRAPPER="" + ANDROID_GOMA_WRAPPER="" if [[ -d $GOMA_DIR ]]; then - GOMA_WRAPPER="$GOMA_DIR/gomacc" + ANDROID_GOMA_WRAPPER="$GOMA_DIR/gomacc" fi # Ninja requires "*_target" for target builds. - GOMA_WRAPPER=${GOMA_WRAPPER} \ + ANDROID_GOMA_WRAPPER=${ANDROID_GOMA_WRAPPER} \ CC_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \ CXX_target=$(basename ${ANDROID_TOOLCHAIN}/*-g++) \ LINK_target=$(basename ${ANDROID_TOOLCHAIN}/*-gcc) \ diff --git a/build/common.gypi b/build/common.gypi index a0e9ab3..b5149a5 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -3090,9 +3090,9 @@ # 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 ${GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'], - ['CXX', '<!(/bin/echo -n ${GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'], - ['LINK', '<!(/bin/echo -n ${GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'], + ['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++)'], |