| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # This file contains common system config stuff for the Android build. | 5 # This file contains common system config stuff for the Android build. |
| 6 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 declare_args() { | 8 declare_args() { |
| 9 # Absolute directory containing the Android source code. | 9 # Absolute directory containing the Android source code. |
| 10 android_src = "" | 10 android_src = "" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 | 61 |
| 62 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" | 62 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" |
| 63 | 63 |
| 64 # Path to the Android NDK and SDK. | 64 # Path to the Android NDK and SDK. |
| 65 android_ndk_root = "//third_party/android_tools/ndk" | 65 android_ndk_root = "//third_party/android_tools/ndk" |
| 66 android_ndk_include_dir = "$android_ndk_root/usr/include" | 66 android_ndk_include_dir = "$android_ndk_root/usr/include" |
| 67 | 67 |
| 68 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" | 68 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" |
| 69 | 69 |
| 70 android_sdk_tools = "${android_sdk_root}/tools" | 70 android_sdk_tools = "${android_sdk_root}/tools" |
| 71 android_sdk_build_tools = "${android_sdk_root}/build-tools/21.0.0" | 71 android_sdk_build_tools = "${android_sdk_root}/build-tools/21.0.1" |
| 72 | 72 |
| 73 # Path to the SDK's android.jar | 73 # Path to the SDK's android.jar |
| 74 android_sdk_jar = "$android_sdk/android.jar" | 74 android_sdk_jar = "$android_sdk/android.jar" |
| 75 | 75 |
| 76 zipalign_path = "$android_sdk_build_tools/zipalign" | 76 zipalign_path = "$android_sdk_build_tools/zipalign" |
| 77 | 77 |
| 78 # Subdirectories inside android_ndk_root that contain the sysroot for the | 78 # Subdirectories inside android_ndk_root that contain the sysroot for the |
| 79 # associated platform. | 79 # associated platform. |
| 80 _android_api_level = 14 | 80 _android_api_level = 14 |
| 81 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86
" | 81 x86_android_sysroot_subdir = "platforms/android-${_android_api_level}/arch-x86
" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 } else if (cpu_arch == "mipsel") { | 139 } else if (cpu_arch == "mipsel") { |
| 140 android_app_abi = "mips" | 140 android_app_abi = "mips" |
| 141 } else { | 141 } else { |
| 142 assert(false, "Unknown Android ABI: " + cpu_arch) | 142 assert(false, "Unknown Android ABI: " + cpu_arch) |
| 143 } | 143 } |
| 144 } else { | 144 } else { |
| 145 if (!defined(is_android_webview_build)) { | 145 if (!defined(is_android_webview_build)) { |
| 146 is_android_webview_build = false | 146 is_android_webview_build = false |
| 147 } | 147 } |
| 148 } | 148 } |
| OLD | NEW |