NOT FOR COMMIT - Example for michaelbai

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.
@@ skipping 70 matching lines @@
     export CHROME_VERSION_EXTRA="beta"
   fi
 
   # 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.
+  # Target architecture to be used. Should be overridden for x86 builds.
+  local target_ach="arm"
+
+  # The following defines will affect platform-specific code generation of both
+  # the C/C++ compiler and V8 mksnapshot.
   case "${TARGET_PRODUCT}" in
     "passion"|"soju"|"sojua"|"sojus"|"yakju"|"mysid"|"nakasi")
       DEFINES+=" target_arch=arm"

[michaelbai, 2012/08/30 16:38:40]

We also need to get ride of the duplicated target_arch here. 

[Peter Beverloo, 2012/08/30 20:17:24]

It's a nice-to-have, but by no means required. I don't think it's worth the
additional switch statement.

       DEFINES+=" arm_neon=1 armv7=1 arm_thumb=1"
       DEFINES+=" ${ORDER_DEFINES}"
       ;;
     "trygon"|"tervigon")
       DEFINES+=" target_arch=arm"
       DEFINES+=" arm_neon=0 armv7=1 arm_thumb=1 arm_fpu=vfpv3-d16"
       DEFINES+=" ${ORDER_DEFINES}"
       ;;
     "full")
       DEFINES+=" target_arch=arm"
       DEFINES+=" arm_neon=0 armv7=0 arm_thumb=1 arm_fpu=vfp"
       ;;
     *x86*)
     # TODO(tedbo): The ia32 build fails on ffmpeg, so we disable it here.
       DEFINES+=" target_arch=ia32 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="ia32"
       ;;
     *)
       echo "TARGET_PRODUCT: ${TARGET_PRODUCT} is not supported." >& 2
       return 1
   esac
+
+  DEFINES+=" android_gdbserver=${ANDROID_NDK_ROOT}/prebuilt/\
+android-${target_arch}/gdbserver/gdbserver"

[michaelbai, 2012/08/30 16:38:40]

For x86 case,

We need set 
target_arch=ia32
android_gdbserver=${ANDROID_NDK_ROOT}/prebuilt/android-x86/gdbserver/gdbserver

[Peter Beverloo, 2012/08/30 20:17:24]

line 118 should read "target_arch="x86"".

 }
 
 
 ################################################################################
 # 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.
@@ skipping 160 matching lines @@
 
   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"
 
   # TODO(torne): This isn't upstream yet. Upstream it or remove this setting.
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android_webview.gyp"
 }