| 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 = "22" | 19 default_android_sdk_version = "22" |
| 20 default_android_sdk_build_tools_version = "22.0.0" | 20 default_android_sdk_build_tools_version = "22.0.0" |
| 21 } | 21 } |
| 22 | 22 |
| 23 if (!defined(google_play_services_library)) { | 23 if (!defined(google_play_services_library)) { |
| 24 google_play_services_library = | 24 google_play_services_library = |
| 25 "//third_party/android_tools:google_play_services_default_java" | 25 "//third_party/android_tools:google_play_services_default_java" |
| 26 } | 26 } |
| 27 | 27 |
| 28 if (!defined(google_play_services_resources)) { |
| 29 google_play_services_resources = |
| 30 "//third_party/android_tools:google_play_services_default_resources" |
| 31 } |
| 32 |
| 28 declare_args() { | 33 declare_args() { |
| 29 android_sdk_root = default_android_sdk_root | 34 android_sdk_root = default_android_sdk_root |
| 30 android_sdk_version = default_android_sdk_version | 35 android_sdk_version = default_android_sdk_version |
| 31 android_sdk_build_tools_version = default_android_sdk_build_tools_version | 36 android_sdk_build_tools_version = default_android_sdk_build_tools_version |
| 32 | 37 |
| 33 android_default_keystore_path = | 38 android_default_keystore_path = |
| 34 "//build/android/ant/chromium-debug.keystore" | 39 "//build/android/ant/chromium-debug.keystore" |
| 35 android_default_keystore_name = "chromiumdebugkey" | 40 android_default_keystore_name = "chromiumdebugkey" |
| 36 android_default_keystore_password = "chromium" | 41 android_default_keystore_password = "chromium" |
| 37 | 42 |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 } else if (current_cpu == "x64") { | 192 } else if (current_cpu == "x64") { |
| 188 android_app_abi = "x86_64" | 193 android_app_abi = "x86_64" |
| 189 } else if (current_cpu == "arm64") { | 194 } else if (current_cpu == "arm64") { |
| 190 android_app_abi = "arm64-v8a" | 195 android_app_abi = "arm64-v8a" |
| 191 } else if (current_cpu == "mips64el") { | 196 } else if (current_cpu == "mips64el") { |
| 192 android_app_abi = "mips64" | 197 android_app_abi = "mips64" |
| 193 } else { | 198 } else { |
| 194 assert(false, "Unknown Android ABI: " + current_cpu) | 199 assert(false, "Unknown Android ABI: " + current_cpu) |
| 195 } | 200 } |
| 196 } | 201 } |
| OLD | NEW |