| 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 = "21" | 19 default_android_sdk_version = "22" |
| 20 default_android_sdk_build_tools_version = "21.0.1" | 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 declare_args() { | 28 declare_args() { |
| 29 android_sdk_root = default_android_sdk_root | 29 android_sdk_root = default_android_sdk_root |
| 30 android_sdk_version = default_android_sdk_version | 30 android_sdk_version = default_android_sdk_version |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 } else if (current_cpu == "mips64el") { | 187 } else if (current_cpu == "mips64el") { |
| 188 android_app_abi = "mips64" | 188 android_app_abi = "mips64" |
| 189 } else { | 189 } else { |
| 190 assert(false, "Unknown Android ABI: " + current_cpu) | 190 assert(false, "Unknown Android ABI: " + current_cpu) |
| 191 } | 191 } |
| 192 } else { | 192 } else { |
| 193 if (!defined(is_android_webview_build)) { | 193 if (!defined(is_android_webview_build)) { |
| 194 is_android_webview_build = false | 194 is_android_webview_build = false |
| 195 } | 195 } |
| 196 } | 196 } |
| OLD | NEW |