| 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 = exec_script("//build/dir_exists.py", | 8 has_chrome_android_internal = exec_script("//build/dir_exists.py", |
| 9 [ rebase_path("//clank", root_build_dir) ], | 9 [ rebase_path("//clank", root_build_dir) ], |
| 10 "string") == "True" | 10 "string") == "True" |
| 11 | 11 |
| 12 if (has_chrome_android_internal) { | 12 if (has_chrome_android_internal) { |
| 13 import("//clank/config.gni") | 13 import("//clank/config.gni") |
| 14 } else { | 14 } else { |
| 15 default_android_sdk_root = "//third_party/android_tools/sdk" | 15 default_android_sdk_root = "//third_party/android_tools/sdk" |
| 16 default_android_sdk_version = "21" | 16 default_android_sdk_version = "21" |
| 17 default_android_sdk_build_tools_version = "21.0.0" | 17 default_android_sdk_build_tools_version = "21.0.1" |
| 18 } | 18 } |
| 19 | 19 |
| 20 declare_args() { | 20 declare_args() { |
| 21 # Absolute directory containing the Android source code. | 21 # Absolute directory containing the Android source code. |
| 22 android_src = "" | 22 android_src = "" |
| 23 | 23 |
| 24 android_sdk_root = default_android_sdk_root | 24 android_sdk_root = default_android_sdk_root |
| 25 android_sdk_version = default_android_sdk_version | 25 android_sdk_version = default_android_sdk_version |
| 26 android_sdk_build_tools_version = default_android_sdk_build_tools_version | 26 android_sdk_build_tools_version = default_android_sdk_build_tools_version |
| 27 | 27 |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 } else if (cpu_arch == "mipsel") { | 153 } else if (cpu_arch == "mipsel") { |
| 154 android_app_abi = "mips" | 154 android_app_abi = "mips" |
| 155 } else { | 155 } else { |
| 156 assert(false, "Unknown Android ABI: " + cpu_arch) | 156 assert(false, "Unknown Android ABI: " + cpu_arch) |
| 157 } | 157 } |
| 158 } else { | 158 } else { |
| 159 if (!defined(is_android_webview_build)) { | 159 if (!defined(is_android_webview_build)) { |
| 160 is_android_webview_build = false | 160 is_android_webview_build = false |
| 161 } | 161 } |
| 162 } | 162 } |
| OLD | NEW |