Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Unified Diff: build/android/envsetup.sh

Issue 148293009: android envsetup: Remove --try-32bit-host flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/envsetup_functions.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 9ef59435866677b9a0d958049109dfc122c58a68..d36d77e49142608622c93d0dd1709bb5019ef1ba 100755
--- a/build/android/envsetup.sh
+++ b/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})."
« no previous file with comments | « no previous file | build/android/envsetup_functions.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698