android envsetup: Remove --host-os flag.

build/android/envsetup_functions.sh

 #!/bin/bash
 
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Defines functions for envsetup.sh which sets up environment for building
 # Chromium on Android.  The build can be either use the Android NDK/SDK or
 # android source tree.  Each has a unique init function which calls functions
 # prefixed with "common_" that is common for both environment setups.
 
 ################################################################################
 # Exports environment variables common to both sdk and non-sdk build (e.g. PATH)
 # based on CHROME_SRC, along with DEFINES for GYP_DEFINES.
 ################################################################################
 common_vars_defines() {
   # Add Android SDK tools to system path.
   export PATH=$PATH:${ANDROID_SDK_ROOT}/tools
   export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
   export PATH=$PATH:${ANDROID_SDK_ROOT}/build-tools/\
 ${ANDROID_SDK_BUILD_TOOLS_VERSION}
 
   # Add Chromium Android development scripts to system path.
   # Must be after CHROME_SRC is set.
   export PATH=$PATH:${CHROME_SRC}/build/android
 
   # 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"
     DEFINES+=" buildtype=Official"
 
     # These defines are used by various chrome build scripts to tag the binary's
     # version string as 'official' in linux builds (e.g. in
     # chrome/trunk/src/chrome/tools/build/version.py).
     export OFFICIAL_BUILD=1
     export CHROMIUM_BUILD="_google_chrome"
@@ skipping 25 matching lines @@
   esac
 }
 
 
 ################################################################################
 # Prints out help message on usage.
 ################################################################################
 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
 }
 
 ################################################################################
 # 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
         ;;
       *)
         # Ignore other command line options
         echo "Unknown option: $1"
         ;;
     esac
     shift
@@ skipping 63 matching lines @@
 ${ANDROID_SDK_VERSION}
 
   common_vars_defines
 
   # We need to supply SDK paths relative to the top of the Android tree to make
   # sure the generated Android makefiles are portable, as they will be checked
   # into the Android tree.
   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}"
   DEFINES+=" android_sdk_root=\$(PWD)/${ANDROID_SDK}"
   DEFINES+=" android_sdk_tools=\$(PWD)/${ANDROID_SDK_TOOLS}"
   DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
   if [[ -n "$CHROME_ANDROID_WEBVIEW_OFFICIAL_BUILD" ]]; then
     DEFINES+=" logging_like_official_build=1"
     DEFINES+=" tracing_like_official_build=1"
   fi
   export GYP_DEFINES="${DEFINES}"
 }