| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 | 2 |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # Defines functions for envsetup.sh which sets up environment for building | 7 # Defines functions for envsetup.sh which sets up environment for building |
| 8 # Chromium on Android. The build can be either use the Android NDK/SDK or | 8 # Chromium on Android. The build can be either use the Android NDK/SDK or |
| 9 # android source tree. Each has a unique init function which calls functions | 9 # android source tree. Each has a unique init function which calls functions |
| 10 # prefixed with "common_" that is common for both environment setups. | 10 # prefixed with "common_" that is common for both environment setups. |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 ${ANDROID_SDK_BUILD_TOOLS_VERSION}" | 272 ${ANDROID_SDK_BUILD_TOOLS_VERSION}" |
| 273 } | 273 } |
| 274 | 274 |
| 275 ################################################################################ | 275 ################################################################################ |
| 276 # To build WebView, we use the Android build system and build inside an Android | 276 # To build WebView, we use the Android build system and build inside an Android |
| 277 # source tree. This method is called from non_sdk_build_init() and adds to the | 277 # source tree. This method is called from non_sdk_build_init() and adds to the |
| 278 # settings specified there. | 278 # settings specified there. |
| 279 ############################################################################# | 279 ############################################################################# |
| 280 webview_build_init() { | 280 webview_build_init() { |
| 281 # Use the latest API in the AOSP prebuilts directory (change with AOSP roll). | 281 # Use the latest API in the AOSP prebuilts directory (change with AOSP roll). |
| 282 export ANDROID_SDK_VERSION=17 | 282 export ANDROID_SDK_VERSION=18 |
| 283 | 283 |
| 284 # For the WebView build we always use the NDK and SDK in the Android tree, | 284 # For the WebView build we always use the NDK and SDK in the Android tree, |
| 285 # and we don't touch ANDROID_TOOLCHAIN which is already set by Android. | 285 # and we don't touch ANDROID_TOOLCHAIN which is already set by Android. |
| 286 export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/8 | 286 export ANDROID_NDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/ndk/8 |
| 287 export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\ | 287 export ANDROID_SDK_ROOT=${ANDROID_BUILD_TOP}/prebuilts/sdk/\ |
| 288 ${ANDROID_SDK_VERSION} | 288 ${ANDROID_SDK_VERSION} |
| 289 | 289 |
| 290 common_vars_defines | 290 common_vars_defines |
| 291 | 291 |
| 292 # We need to supply SDK paths relative to the top of the Android tree to make | 292 # We need to supply SDK paths relative to the top of the Android tree to make |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 export GYP_DEFINES="${DEFINES}" | 326 export GYP_DEFINES="${DEFINES}" |
| 327 | 327 |
| 328 export GYP_GENERATORS="android" | 328 export GYP_GENERATORS="android" |
| 329 | 329 |
| 330 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" | 330 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All" |
| 331 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" | 331 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} limit_to_target_all=1" |
| 332 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" | 332 export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} auto_regeneration=0" |
| 333 | 333 |
| 334 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" | 334 export CHROMIUM_GYP_FILE="${CHROME_SRC}/android_webview/all_webview.gyp" |
| 335 } | 335 } |
| OLD | NEW |