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

Unified Diff: build/android/envsetup.sh

Issue 222203005: envsetup: Remove host_arch bitness check, let android_gyp print that it's going away. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/gyp_chromium » ('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 f558f133c8f0980cc6f4789b945d0b646415ece2..b7ed3522f8e2764ab105c7f3eca21fde5139b5b2 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -14,21 +14,6 @@ fi
SCRIPT_DIR="$(dirname "${BASH_SOURCE:-$0}")"
-# Get host architecture, and abort if it is 32-bit.
-host_arch=$(uname -m)
-case "${host_arch}" in
- x86_64) # pass
- ;;
- i?86)
- echo "ERROR: Android build requires a 64-bit host build machine."
- return 1
- ;;
- *)
- echo "ERROR: Unsupported host architecture (${host_arch})."
- echo "Try running this script on a Linux/x86_64 machine instead."
- 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.
@@ -72,9 +57,7 @@ if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
export CHROME_BUILD_TYPE="_official"
fi
-# Performs a gyp_chromium run to convert gyp->Makefile for android code.
android_gyp() {
- # This is just a simple wrapper of gyp_chromium, please don't add anything
- # in this function.
+ echo "Please call build/gyp_chromium instead. android_gyp is going away."
Yaron 2014/04/02 22:04:19 In another deprecation, a table is flipped: http:/
"${CHROME_SRC}/build/gyp_chromium" --depth="${CHROME_SRC}" --check "$@"
}
« no previous file with comments | « no previous file | build/gyp_chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698