Roll Android SDK in android_tools repo to api version 16.

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 148 matching lines @@
     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}"
 
   # Android sdk platform version to use
-  export ANDROID_SDK_VERSION=15
+  export ANDROID_SDK_VERSION=16
   # 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 40 matching lines @@
 #############################################################################
 non_sdk_build_init() {
   # 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"
 
   # We export "ANDROID_NDK_ROOT" for building Chromium for Android by NDK.
   export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/android-ndk-r7
 
   # Android sdk platform version to use
   export ANDROID_SDK_VERSION=15

[Yaron, 2012/08/06 18:12:49]

Seems this should be 16 as well.

[navabi, 2012/08/07 01:17:07]

Since this is copied and pasted between sdk_build_init and non_sdk_build_init I
moved it out into envsetup.sh.

Done.

 
   # We export "ANDROID_SDK_ROOT" for building Java source with the SDK.
   export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\
 ${ANDROID_SDK_VERSION}
   # Needed by android antfiles when creating apks.
   export ANDROID_SDK_HOME=${ANDROID_SDK_ROOT}
 
   common_vars_defines
 
   DEFINES+=" sdk_build=0"
@@ skipping 41 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"
 }