X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbuild%2Fandroid%2Fenvsetup.sh;h=46e3a4eaeccdfbfddf1a76d2c35e756460287aa6;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=9ef59435866677b9a0d958049109dfc122c58a68;hpb=7338fba38ba696536d1cc9d389afd716a6ab2fe6;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/build/android/envsetup.sh b/src/build/android/envsetup.sh index 9ef5943..46e3a4e 100755 --- a/src/build/android/envsetup.sh +++ b/src/build/android/envsetup.sh @@ -34,24 +34,14 @@ if [[ "${ANDROID_SDK_BUILD}" -ne 1 ]]; then echo "Initializing for non-SDK build." fi -# Get host architecture, and abort if it is 32-bit, unless --try-32 -# is also used. +# Get host architecture, and abort if it is 32-bit. host_arch=$(uname -m) case "${host_arch}" in x86_64) # pass ;; i?86) - if [[ -z "${try_32bit_host_build}" ]]; then - echo "ERROR: Android build requires a 64-bit host build machine." - echo "If you really want to try it on this machine, use the \ ---try-32bit-host flag." - echo "Be warned that this may fail horribly at link time, due \ -very large binaries." - return 1 - else - echo "WARNING: 32-bit host build enabled. Here be dragons!" - host_arch=x86 - fi + echo "ERROR: Android build requires a 64-bit host build machine." + return 1 ;; *) echo "ERROR: Unsupported host architecture (${host_arch})." @@ -59,18 +49,6 @@ very large binaries." return 1 esac -case "${host_os}" in - "linux") - toolchain_dir="linux-${host_arch}" - ;; - "mac") - toolchain_dir="darwin-${host_arch}" - ;; - *) - echo "Host platform ${host_os} is not supported" >& 2 - return 1 -esac - CURRENT_DIR="$(readlink -f "${SCRIPT_DIR}/../../")" if [[ -z "${CHROME_SRC}" ]]; then # If $CHROME_SRC was not set, assume current directory is CHROME_SRC. @@ -118,7 +96,6 @@ export GYP_CROSSCOMPILE=1 android_gyp() { # This is just a simple wrapper of gyp_chromium, please don't add anything # in this function. - echo "GYP_GENERATORS set to '$GYP_GENERATORS'" ( "${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@" )