Chromium Code Reviews| 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 assert(rebase_path("//", root_build_dir) == "../../", | 8 assert(rebase_path("//", root_build_dir) == "../../", |
| 9 "Android output directory must be nested 2 levels within src/ (" + | 9 "Android output directory must be nested 2 levels within src/ (" + |
| 10 "e.g.: out-gn/Debug). http://crbug.com/412935") | 10 "e.g.: out-gn/Debug). http://crbug.com/412935") |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 | 143 |
| 144 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" | 144 android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}" |
| 145 | 145 |
| 146 # Path to the Android NDK and SDK. | 146 # Path to the Android NDK and SDK. |
| 147 android_ndk_root = "//third_party/android_tools/ndk" | 147 android_ndk_root = "//third_party/android_tools/ndk" |
| 148 android_ndk_include_dir = "$android_ndk_root/usr/include" | 148 android_ndk_include_dir = "$android_ndk_root/usr/include" |
| 149 | 149 |
| 150 android_sdk_tools = "${android_sdk_root}/tools" | 150 android_sdk_tools = "${android_sdk_root}/tools" |
| 151 android_sdk_build_tools = | 151 android_sdk_build_tools = |
| 152 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version" | 152 "${android_sdk_root}/build-tools/$android_sdk_build_tools_version" |
| 153 android_sdk_build_tools_version = android_sdk_build_tools_version | |
|
agrieve
2016/03/19 00:12:54
no-op?
jbudorick
2016/03/19 00:57:42
hm, yeah. Probably a relic from an wip version?
| |
| 153 | 154 |
| 154 # Path to the SDK's android.jar | 155 # Path to the SDK's android.jar |
| 155 android_sdk_jar = "$android_sdk/android.jar" | 156 android_sdk_jar = "$android_sdk/android.jar" |
| 156 | 157 |
| 157 zipalign_path = "$android_sdk_build_tools/zipalign" | 158 zipalign_path = "$android_sdk_build_tools/zipalign" |
| 158 | 159 |
| 159 # Subdirectories inside android_ndk_root that contain the sysroot for the | 160 # Subdirectories inside android_ndk_root that contain the sysroot for the |
| 160 # associated platform. | 161 # associated platform. |
| 161 _android_api_level = 16 | 162 _android_api_level = 16 |
| 162 x86_android_sysroot_subdir = | 163 x86_android_sysroot_subdir = |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 } else if (current_cpu == "x64") { | 247 } else if (current_cpu == "x64") { |
| 247 android_app_abi = "x86_64" | 248 android_app_abi = "x86_64" |
| 248 } else if (current_cpu == "arm64") { | 249 } else if (current_cpu == "arm64") { |
| 249 android_app_abi = "arm64-v8a" | 250 android_app_abi = "arm64-v8a" |
| 250 } else if (current_cpu == "mips64el") { | 251 } else if (current_cpu == "mips64el") { |
| 251 android_app_abi = "mips64" | 252 android_app_abi = "mips64" |
| 252 } else { | 253 } else { |
| 253 assert(false, "Unknown Android ABI: " + current_cpu) | 254 assert(false, "Unknown Android ABI: " + current_cpu) |
| 254 } | 255 } |
| 255 } | 256 } |
| OLD | NEW |