| Index: build/android/envsetup_functions.sh
|
| diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
|
| index 67084311542be74788f35f1e8bb5fc7add4c2b2c..e1534d1112208a19efe33318192146ff9baadc98 100755
|
| --- a/build/android/envsetup_functions.sh
|
| +++ b/build/android/envsetup_functions.sh
|
| @@ -76,8 +76,7 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}
|
| # http://crbug.com/142642
|
| export STRIP=$(echo ${ANDROID_TOOLCHAIN}/*-strip)
|
|
|
| - # The set of GYP_DEFINES to pass to gyp. Use 'readlink -e' on directories
|
| - # to canonicalize them (remove double '/', remove trailing '/', etc).
|
| + # The set of GYP_DEFINES to pass to gyp.
|
| DEFINES="OS=android"
|
| DEFINES+=" host_os=${host_os}"
|
|
|
| @@ -164,9 +163,6 @@ print_usage() {
|
|
|
| ################################################################################
|
| # Process command line options.
|
| -# --target-arch= Specifices target CPU architecture. Currently supported
|
| -# architectures are "arm" (default), and "x86".
|
| -# --help Prints out help message.
|
| ################################################################################
|
| process_options() {
|
| host_os=$(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')
|
| @@ -199,16 +195,7 @@ process_options() {
|
| }
|
|
|
| ################################################################################
|
| -# 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
|
| +# Initializes environment variables for NDK/SDK build.
|
| ################################################################################
|
| sdk_build_init() {
|
|
|
| @@ -266,8 +253,7 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}"
|
|
|
| ################################################################################
|
| # 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.
|
| +# source tree.
|
| #############################################################################
|
| webview_build_init() {
|
| # Use the latest API in the AOSP prebuilts directory (change with AOSP roll).
|
|
|