Pass target architecture to build/android/envsetup.sh

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.
 
 ################################################################################
 # Check to make sure the toolchain exists for the NDK version.
 ################################################################################
 common_check_toolchain() {
   if [[ ! -d "${ANDROID_TOOLCHAIN}" ]]; then
     echo "Can not find Android toolchain in ${ANDROID_TOOLCHAIN}." >& 2
     echo "The NDK version might be wrong." >& 2
     return 1
   fi
 }
 
 ################################################################################
 # Exports environment variables common to both sdk and non-sdk build (e.g. PATH)
 # based on CHROME_SRC and ANDROID_TOOLCHAIN, along with DEFINES for GYP_DEFINES.
 ################################################################################
 common_vars_defines() {
-
   # Set toolchain path according to product architecture.
-  toolchain_arch="arm-linux-androideabi"
-  if [[ "${TARGET_PRODUCT}" =~ .*x86.* ]]; then
-    toolchain_arch="x86"
-  fi
+  case "${TARGET_ARCH}" in
+    "arm")
+      toolchain_arch="arm-linux-androideabi"
+      ;;
+    "x86")
+      toolchain_arch="x86"
+      ;;
+    *)
+      echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
+      usage
+      return 1
+      ;;
+  esac
 
   toolchain_version="4.6"
   # We directly set the gcc_version since we know what we use, and it should
   # be set to xx instead of x.x. Refer the output of compiler_version.py.
   gcc_version="46"
   toolchain_target=$(basename \
     ${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}-${toolchain_version})
   toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_target}"\
 "/prebuilt/${toolchain_dir}/bin/"
 
@@ skipping 49 matching lines @@
 
   # The order file specifies the order of symbols in the .text section of the
   # shared library, libchromeview.so.  The file is an order list of section
   # names and the library is linked with option
   # --section-ordering-file=<orderfile>. The order file is updated by profiling
   # startup after compiling with the order_profiling=1 GYP_DEFINES flag.
   ORDER_DEFINES="order_text_section=${CHROME_SRC}/orderfiles/orderfile.out"
 
   # The following defines will affect ARM code generation of both C/C++ compiler
   # and V8 mksnapshot.
-  case "${TARGET_PRODUCT}" in
-    "passion"|"soju"|"sojua"|"sojus"|"yakju"|"mysid"|"nakasi")
-      DEFINES+=" arm_neon=1 armv7=1 arm_thumb=1"
-      DEFINES+=" ${ORDER_DEFINES}"
-      TARGET_ARCH="arm"
-      ;;
-    "trygon"|"tervigon")
+  case "${TARGET_ARCH}" in
+    "arm")
       DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
       DEFINES+=" ${ORDER_DEFINES}"
-      TARGET_ARCH="arm"
+      DEFINES+=" target_arch=arm"
       ;;
-    "full")
-      DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
-      TARGET_ARCH="arm"
-      ;;
-    *x86*)
+    "x86")
     # TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here.
       DEFINES+=" use_libffmpeg=0"
 
       host_arch=$(uname -m | sed -e \
         's/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/')
       DEFINES+=" host_arch=${host_arch}"
-      TARGET_ARCH="x86"
-      ;;
-    *)
-      echo "TARGET_PRODUCT: ${TARGET_PRODUCT} is not supported." >& 2
-      return 1
-  esac
-
-  case "${TARGET_ARCH}" in
-    "arm")
-      DEFINES+=" target_arch=arm"
-      ;;
-    "x86")
       DEFINES+=" target_arch=ia32"
       ;;
     *)
       echo "TARGET_ARCH: ${TARGET_ARCH} is not supported." >& 2
+      usage
       return 1
   esac
 
   DEFINES+=" android_gdbserver=${ANDROID_NDK_ROOT}/prebuilt/\
 android-${TARGET_ARCH}/gdbserver/gdbserver"
 }
 
 
 ################################################################################
 # Exports common GYP variables based on variable DEFINES and CHROME_SRC.
 ################################################################################
 common_gyp_vars() {
   export GYP_DEFINES="${DEFINES}"
 
   # Set GYP_GENERATORS to make-android if it's currently unset or null.
   export GYP_GENERATORS="${GYP_GENERATORS:-make-android}"
 
   # Use our All target as the default
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
 
   # We want to use our version of "all" targets.
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"
 }
 
 
 ################################################################################
+# Prints out help message on usage.
+################################################################################
+usage() {

[Isaac (away), 2012/10/24 20:54:48]

rename print_usage

[Jinsuk Kim (do not use this), 2012/10/25 01:03:59]

Done.

+  echo "usage: ${0##*/} [-t target_arch] [-h]" >& 2
+  echo "-t target_arch     target CPU architecture (arm=default, x86)" >& 2
+  echo "-h                 this help" >& 2
+}
+
+################################################################################
+# Process command line options.
+# -t target_arch  Specifices target CPU architecture. Currently supported
+#                 architectures are "arm" (default), and "x86".
+# -h              Prints out help message.
+################################################################################
+process_options() {
+  while getopts “ht:” OPTION; do
+    case $OPTION in
+      h)
+        usage
+        return 1
+        ;;
+      t)
+        target_arch=$OPTARG
+        ;;
+      *)
+        echo "invalid command line option: $OPTARG" >& 2
+        usage
+        return 1
+        ;;
+    esac
+  done
+
+  if [ $# -ge ${OPTIND} ]; then

[Isaac (away), 2012/10/24 20:54:48]

I don't see where $OPTIND is defined.

[Jinsuk Kim (do not use this), 2012/10/25 01:03:59]

OPTIND (together with OPTERR, OPTARG) is defined (and dynamically updated) by
the function getopts to handled the currently parsed option and the associated
values. I added local statement at the top of the function to clarify they are
used in this method only.

+    eval echo "Unexpected command line argument: \${${OPTIND}}" >& 2
+    usage
+    return 1
+  fi
+
+  # Sets TARGET_ARCH. Defaults to arm if not specified.
+  TARGET_ARCH=${target_arch:-arm}
+}
+
+################################################################################
 # Initializes environment variables for NDK/SDK build. Only Android NDK Revision
 # 7 on Linux or Mac is offically supported. To run this script, the system
 # environment ANDROID_NDK_ROOT must be set to Android NDK's root path.  The
 # ANDROID_SDK_ROOT only needs to be set to override the default SDK which is in
 # the tree under $ROOT/src/third_party/android_tools/sdk.
 # To build Chromium for Android with NDK/SDK follow the steps below:
 #  > export ANDROID_NDK_ROOT=<android ndk root>
 #  > export ANDROID_SDK_ROOT=<android sdk root> # to override the default sdk
 #  > . build/android/envsetup.sh
 #  > make
 ################################################################################
 sdk_build_init() {
   # If ANDROID_NDK_ROOT is set when envsetup is run, use the ndk pointed to by
   # the environment variable.  Otherwise, use the default ndk from the tree.
   if [[ -z "${ANDROID_NDK_ROOT}" || ! -d "${ANDROID_NDK_ROOT}" ]]; then
     export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"
   fi
 
   # If ANDROID_SDK_ROOT is set when envsetup is run, and if it has the
   # right SDK-compatible directory layout, use the sdk pointed to by the
   # environment variable.  Otherwise, use the default sdk from the tree.
   local sdk_suffix=platforms/android-${ANDROID_SDK_VERSION}
   if [[ -z "${ANDROID_SDK_ROOT}" || \
        ! -d "${ANDROID_SDK_ROOT}/${sdk_suffix}" ]]; then
     export ANDROID_SDK_ROOT="${CHROME_SRC}/third_party/android_tools/sdk/"
   fi
 
   unset ANDROID_BUILD_TOP
 
-  # Set default target.
-  export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}"

[Yaron, 2012/10/24 20:50:17]

build/android/emulator.py refers to this environment variable. I'm not familiar
with the specifics of it, but it'll break on x86 without additional changes.

[Jinsuk Kim (do not use this), 2012/10/25 01:03:59]

Thanks for catching it. I reverted the change to have the TARGET_PRODUCT defined
as before.

On 2012/10/24 20:50:17, Yaron wrote:

-
   # Unset toolchain so that it can be set based on TARGET_PRODUCT.
   # This makes it easy to switch between architectures.
   unset ANDROID_TOOLCHAIN
 
   common_vars_defines
 
   DEFINES+=" sdk_build=1"
   # If we are building NDK/SDK, and in the upstream (open source) tree,
   # define a special variable for bringup purposes.
   case "${ANDROID_BUILD_TOP-undefined}" in
@@ skipping 65 matching lines @@
   export GYP_DEFINES="${DEFINES}"
 
   export GYP_GENERATORS="android"
 
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1"
   export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0"
 
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp"
 }