| 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 22 matching lines...) Expand all Loading... |
| 33 if (!defined(google_play_services_library)) { | 33 if (!defined(google_play_services_library)) { |
| 34 google_play_services_library = | 34 google_play_services_library = |
| 35 "//third_party/android_tools:google_play_services_default_java" | 35 "//third_party/android_tools:google_play_services_default_java" |
| 36 } | 36 } |
| 37 | 37 |
| 38 if (!defined(google_play_services_resources)) { | 38 if (!defined(google_play_services_resources)) { |
| 39 google_play_services_resources = | 39 google_play_services_resources = |
| 40 "//third_party/android_tools:google_play_services_default_resources" | 40 "//third_party/android_tools:google_play_services_default_resources" |
| 41 } | 41 } |
| 42 | 42 |
| 43 webview_public_framework_jar = |
| 44 "//third_party/android_platform/webview/frameworks_6.0.jar" |
| 43 if (!defined(webview_framework_jar)) { | 45 if (!defined(webview_framework_jar)) { |
| 44 webview_framework_jar = | 46 webview_framework_jar = webview_public_framework_jar |
| 45 "//third_party/android_platform/webview/frameworks_6.0.jar" | |
| 46 } | 47 } |
| 47 | 48 |
| 48 declare_args() { | 49 declare_args() { |
| 49 android_sdk_root = default_android_sdk_root | 50 android_sdk_root = default_android_sdk_root |
| 50 android_sdk_version = default_android_sdk_version | 51 android_sdk_version = default_android_sdk_version |
| 51 android_sdk_build_tools_version = default_android_sdk_build_tools_version | 52 android_sdk_build_tools_version = default_android_sdk_build_tools_version |
| 52 | 53 |
| 53 # Libc++ library directory. Override to use a custom libc++ binary. | 54 # Libc++ library directory. Override to use a custom libc++ binary. |
| 54 android_libcpp_lib_dir = "" | 55 android_libcpp_lib_dir = "" |
| 55 | 56 |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 } else if (current_cpu == "mips64el") { | 259 } else if (current_cpu == "mips64el") { |
| 259 android_app_abi = "mips64" | 260 android_app_abi = "mips64" |
| 260 } else { | 261 } else { |
| 261 assert(false, "Unknown Android ABI: " + current_cpu) | 262 assert(false, "Unknown Android ABI: " + current_cpu) |
| 262 } | 263 } |
| 263 | 264 |
| 264 if (android_libcpp_lib_dir == "") { | 265 if (android_libcpp_lib_dir == "") { |
| 265 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" | 266 android_libcpp_lib_dir = "${android_libcpp_root}/libs/${android_app_abi}" |
| 266 } | 267 } |
| 267 } | 268 } |
| OLD | NEW |