android envsetup: Remove --host-os flag.

build/android/envsetup_functions.sh

Index: build/android/envsetup_functions.sh
diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
index 9e2bfbca13cef67c3a44bd99fd88029441bf5749..547e195592b0ff357ac035f26e3c5ea7180392ee 100755
--- a/build/android/envsetup_functions.sh
+++ b/build/android/envsetup_functions.sh
@@ -26,7 +26,6 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
 
   # The set of GYP_DEFINES to pass to gyp.
   DEFINES="OS=android"
-  DEFINES+=" host_os=${host_os}"
 
   if [[ -n "$CHROME_ANDROID_OFFICIAL_BUILD" ]]; then
     DEFINES+=" branding=Chrome"
@@ -72,7 +71,6 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
 print_usage() {
   echo "usage: ${0##*/} [--target-arch=value] [--help]" >& 2
   echo "--target-arch=value     target CPU architecture (arm=default, x86)" >& 2
-  echo "--host-os=value         override host OS detection (linux, mac)" >&2
   echo "--help                  this help" >& 2
 }
 
@@ -80,15 +78,11 @@ print_usage() {
 # Process command line options.
 ################################################################################
 process_options() {
-  host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
   while [[ -n $1 ]]; do
     case "$1" in
       --target-arch=*)
         target_arch="$(echo "$1" | sed 's/^[^=]*=//')"
         ;;
-      --host-os=*)
-        host_os="$(echo "$1" | sed 's/^[^=]*=//')"
-        ;;
       --help)
         print_usage
         return 1
@@ -172,20 +166,11 @@ ${ANDROID_SDK_VERSION}
   ANDROID_SDK=$(python -c \
       "import os.path; print os.path.relpath('${ANDROID_SDK_ROOT}', \
       '${ANDROID_BUILD_TOP}')")
-  case "${host_os}" in
-    "linux")
-      ANDROID_SDK_TOOLS=$(python -c \
-          "import os.path; \
-          print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/linux', \
-          '${ANDROID_BUILD_TOP}')")
-      ;;
-    "mac")
-      ANDROID_SDK_TOOLS=$(python -c \
-          "import os.path; \
-          print os.path.relpath('${ANDROID_SDK_ROOT}/../tools/darwin', \
-          '${ANDROID_BUILD_TOP}')")
-      ;;
-  esac
+  ANDROID_SDK_TOOLS=$(python -c \
+      "import os.path, sys; \
+      print os.path.relpath( \
+      '${ANDROID_SDK_ROOT}/../tools/' + sys.platform.rstrip('23'), \

[Torne, 2014/02/21 11:32:49]

Unfortunately this broke downstream mac builds and I didn't notice.

We generate all the makefiles in one go, on linux, even for mac hosts, so
sys.platform here is always "linux[23]", never "darwin". So, mac is now trying
to run the linux version of the sdk tools and failing. We need to respect
host_os and not detect anything based on the current platform :/

To make matters more irritating, this CL made the M34 branch, but a fix on trunk
will not, so we probably need to fix this separately on M34. I'll see if I have
time to deal with that later today..

[Nico, 2014/02/21 15:07:44]

D'oh, sorry!
Can't you do the regular merge process? (File a bug, fix on trunk, set
merge-requested on bug, drover over to branch)?

+      '${ANDROID_BUILD_TOP}')")
   DEFINES+=" android_webview_build=1"
   DEFINES+=" android_src=\$(PWD)"
   DEFINES+=" android_sdk=\$(PWD)/${ANDROID_SDK}"