Remove redundant command line option.

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 147 matching lines @@
   export CHROMIUM_GYP_FILE="${CHROME_SRC}/build/all_android.gyp"
 }
 
 
 ################################################################################
 # 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.
-# TODO(navabi): Add NDK to $ROOT/src/third_party/android_tools/ndk.
 # 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 --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
 
-  # Makes sure ANDROID_BUILD_TOP is unset if build has option --sdk
   unset ANDROID_BUILD_TOP
 
   # Set default target.
   export TARGET_PRODUCT="${TARGET_PRODUCT:-trygon}"
 
   # 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
@@ skipping 34 matching lines @@
 }
 
 ################################################################################
 # Initializes environment variables for build with android source.  This expects
 # android environment to be set up along with lunch.  To build:
 #  > . build/envsetup.sh
 #  >  lunch <lunch-type>
 #  > . build/android/envsetup.sh
 #  > make
 #############################################################################
 non_sdk_build_init() {

[Yaron, 2012/10/15 22:47:01]

Why not remove this section entirely?

[shashi, 2012/10/15 22:54:50]

Partially because of power bot, which seems to be the only place using it.
I am looking into ways in which I can remove this, I assume adding exports to
buildbot scripts should fix it.

[Yaron, 2012/10/15 23:11:32]

I thought powerbot only needs lunch and doesn't need the rest of this build.

[shashi, 2012/10/15 23:37:33]

Just verified you are right :).
Fixing power bot first.
On 2012/10/15 23:11:32, Yaron wrote:

[shashi, 2012/10/16 23:00:49]

Done.

With Frank's change, this should be fixed.
The issue was sdk_build_init unsets ANDROID_BUILD_TOP which lead to script
failures. So doing a --no-sdk would avoid that.
The code which does lunch and envsetup is in build bot repo, and the same code
is shared between with both m18 and master for sharded perf bots ideally we
should also remove that code, but it can also affect perf bots on m18.

On 2012/10/15 23:37:33, shashi wrote:

   # We export "TOP" here so that "mmm" can be run to build Java code without
   # having to cd to $ANDROID_BUILD_TOP.
   export TOP="$ANDROID_BUILD_TOP"
 
   # Set "ANDROID_NDK_ROOT" as checked-in version, if it was not set.
   if [[ "${ANDROID_NDK_ROOT}" || ! -d "$ANDROID_NDK_ROOT" ]] ; then
     export ANDROID_NDK_ROOT="${CHROME_SRC}/third_party/android_tools/ndk/"
   fi
   if [[ ! -d "${ANDROID_NDK_ROOT}" ]] ; then
     echo "Can not find Android NDK root ${ANDROID_NDK_ROOT}." >& 2
@@ skipping 68 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"
 }