| 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 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 if (has_chrome_android_internal) { | 26 if (has_chrome_android_internal) { |
| 27 import("//clank/config.gni") | 27 import("//clank/config.gni") |
| 28 } | 28 } |
| 29 | 29 |
| 30 if (!defined(extra_chrome_shared_library_configs)) { | 30 if (!defined(extra_chrome_shared_library_configs)) { |
| 31 extra_chrome_shared_library_configs = [] | 31 extra_chrome_shared_library_configs = [] |
| 32 } | 32 } |
| 33 | 33 |
| 34 if (!defined(default_android_ndk_root)) { | 34 if (!defined(default_android_ndk_root)) { |
| 35 default_android_ndk_major_version = "10" |
| 35 default_android_ndk_root = "//third_party/android_tools/ndk" | 36 default_android_ndk_root = "//third_party/android_tools/ndk" |
| 36 default_android_ndk_version = "r10e" | 37 default_android_ndk_version = "r10e" |
| 37 } else { | 38 } else { |
| 38 assert(defined(default_android_ndk_version)) | 39 assert(defined(default_android_ndk_version)) |
| 39 } | 40 } |
| 40 | 41 |
| 41 if (!defined(default_android_sdk_root)) { | 42 if (!defined(default_android_sdk_root)) { |
| 42 default_android_sdk_root = "//third_party/android_tools/sdk" | 43 default_android_sdk_root = "//third_party/android_tools/sdk" |
| 43 default_android_sdk_version = "23" | 44 default_android_sdk_version = "23" |
| 44 default_android_sdk_build_tools_version = "23.0.1" | 45 default_android_sdk_build_tools_version = "23.0.1" |
| (...skipping 16 matching lines...) Expand all Loading... |
| 61 "//third_party/android_tools:google_play_services_default_resources" | 62 "//third_party/android_tools:google_play_services_default_resources" |
| 62 } | 63 } |
| 63 | 64 |
| 64 webview_public_framework_jar = | 65 webview_public_framework_jar = |
| 65 "//third_party/android_platform/webview/frameworks_6.0.jar" | 66 "//third_party/android_platform/webview/frameworks_6.0.jar" |
| 66 if (!defined(webview_framework_jar)) { | 67 if (!defined(webview_framework_jar)) { |
| 67 webview_framework_jar = webview_public_framework_jar | 68 webview_framework_jar = webview_public_framework_jar |
| 68 } | 69 } |
| 69 | 70 |
| 70 declare_args() { | 71 declare_args() { |
| 72 android_ndk_major_version = default_android_ndk_major_version |
| 71 android_ndk_root = default_android_ndk_root | 73 android_ndk_root = default_android_ndk_root |
| 72 android_ndk_version = default_android_ndk_version | 74 android_ndk_version = default_android_ndk_version |
| 73 | 75 |
| 74 android_sdk_root = default_android_sdk_root | 76 android_sdk_root = default_android_sdk_root |
| 75 android_sdk_version = default_android_sdk_version | 77 android_sdk_version = default_android_sdk_version |
| 76 android_sdk_build_tools_version = default_android_sdk_build_tools_version | 78 android_sdk_build_tools_version = default_android_sdk_build_tools_version |
| 77 | 79 |
| 78 # Libc++ library directory. Override to use a custom libc++ binary. | 80 # Libc++ library directory. Override to use a custom libc++ binary. |
| 79 android_libcpp_lib_dir = "" | 81 android_libcpp_lib_dir = "" |
| 80 | 82 |
| (...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } else if (current_cpu == "mips64el") { | 284 } else if (current_cpu == "mips64el") { |
| 283 android_app_abi = "mips64" | 285 android_app_abi = "mips64" |
| 284 } else { | 286 } else { |
| 285 assert(false, "Unknown Android ABI: " + current_cpu) | 287 assert(false, "Unknown Android ABI: " + current_cpu) |
| 286 } | 288 } |
| 287 | 289 |
| 288 if (android_libcpp_lib_dir == "") { | 290 if (android_libcpp_lib_dir == "") { |
| 289 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" | 291 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" |
| 290 } | 292 } |
| 291 } | 293 } |
| OLD | NEW |