Remove the dependency on the STRIP env variable for Android

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 174 matching lines @@
   DEFINES+=" android_src='NOT_SDK_COMPLIANT'"
   DEFINES+=" android_product_out=${CHROME_SRC}/out/android"
   DEFINES+=" android_lib='NOT_SDK_COMPLIANT'"
   DEFINES+=" android_static_lib='NOT_SDK_COMPLIANT'"
   DEFINES+=\
 " android_sdk=${ANDROID_SDK_ROOT}/platforms/android-${ANDROID_SDK_VERSION}"
   DEFINES+=" android_sdk_root=${ANDROID_SDK_ROOT}"
   DEFINES+=" android_sdk_tools=${ANDROID_SDK_ROOT}/platform-tools"
   DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
+  DEFINES+=" android_strip=${STRIP}"

[Torne, 2012/08/14 16:09:33]

Can't we derive this from android_toolchain inside the gyp files, rather than
passing it in? I'd prefer if we pass the smallest possible set of environment
variables here.

 
   common_gyp_vars
 
   if [ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]; then
     # Can not build WebView with NDK/SDK because it needs the Android build
     # system and build inside an Android source tree.
     echo "Can not build WebView with NDK/SDK.  Requires android source tree." \
         >& 2
     echo "Try . build/android/envsetup.sh instead." >& 2
     return 1
@@ skipping 34 matching lines @@
     return
   fi
 
   # The non-SDK build currently requires the SDK path to build the framework
   # Java aidl files. TODO(steveblock): Investigate avoiding this requirement.
   DEFINES+=" android_sdk=${ANDROID_SDK_ROOT}"
   DEFINES+=" android_sdk_root=${ANDROID_SDK_ROOT}"
   DEFINES+=" android_sdk_tools=${ANDROID_SDK_ROOT}/../tools/linux"
   DEFINES+=" android_sdk_version=${ANDROID_SDK_VERSION}"
   DEFINES+=" android_toolchain=${ANDROID_TOOLCHAIN}"
+  DEFINES+=" android_strip=${STRIP}"
 
   common_gyp_vars
 }
 
 ################################################################################
 # To build WebView, we use the Android build system and build inside an Android
 # source tree. This method is called from non_sdk_build_init() and adds to the
 # settings specified there.
 #############################################################################
 webview_build_init() {
@@ skipping 17 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"
 }