| 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 has_chrome_android_internal = | 8 has_chrome_android_internal = |
| 9 exec_script("//build/dir_exists.py", | 9 exec_script("//build/dir_exists.py", |
| 10 [ rebase_path("//clank", root_build_dir) ], | 10 [ rebase_path("//clank", root_build_dir) ], |
| 11 "string") == "True" | 11 "string") == "True" |
| 12 | 12 |
| 13 if (has_chrome_android_internal) { | 13 if (has_chrome_android_internal) { |
| 14 import("//clank/config.gni") | 14 import("//clank/config.gni") |
| 15 } | 15 } |
| 16 | 16 |
| 17 if (!defined(default_android_sdk_root)) { | 17 if (!defined(default_android_sdk_root)) { |
| 18 default_android_sdk_root = "//third_party/android_tools/sdk" | 18 default_android_sdk_root = "//third_party/android_tools/sdk" |
| 19 default_android_sdk_version = "23" | 19 default_android_sdk_version = "23" |
| 20 default_android_sdk_build_tools_version = "23.0.1" | 20 default_android_sdk_build_tools_version = "23.0.0" |
| 21 } | 21 } |
| 22 | 22 |
| 23 if (!defined(default_android_keystore_path)) { | 23 if (!defined(default_android_keystore_path)) { |
| 24 default_android_keystore_path = | 24 default_android_keystore_path = |
| 25 "//build/android/ant/chromium-debug.keystore" | 25 "//build/android/ant/chromium-debug.keystore" |
| 26 default_android_keystore_name = "chromiumdebugkey" | 26 default_android_keystore_name = "chromiumdebugkey" |
| 27 default_android_keystore_password = "chromium" | 27 default_android_keystore_password = "chromium" |
| 28 } | 28 } |
| 29 | 29 |
| 30 if (!defined(google_play_services_library)) { | 30 if (!defined(google_play_services_library)) { |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 } else if (current_cpu == "x64") { | 222 } else if (current_cpu == "x64") { |
| 223 android_app_abi = "x86_64" | 223 android_app_abi = "x86_64" |
| 224 } else if (current_cpu == "arm64") { | 224 } else if (current_cpu == "arm64") { |
| 225 android_app_abi = "arm64-v8a" | 225 android_app_abi = "arm64-v8a" |
| 226 } else if (current_cpu == "mips64el") { | 226 } else if (current_cpu == "mips64el") { |
| 227 android_app_abi = "mips64" | 227 android_app_abi = "mips64" |
| 228 } else { | 228 } else { |
| 229 assert(false, "Unknown Android ABI: " + current_cpu) | 229 assert(false, "Unknown Android ABI: " + current_cpu) |
| 230 } | 230 } |
| 231 } | 231 } |
| OLD | NEW |