| 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 25 matching lines...) Expand all Loading... |
| 36 if (!defined(default_android_sdk_root)) { | 36 if (!defined(default_android_sdk_root)) { |
| 37 default_android_sdk_root = "//third_party/android_tools/sdk" | 37 default_android_sdk_root = "//third_party/android_tools/sdk" |
| 38 default_android_sdk_version = "24" | 38 default_android_sdk_version = "24" |
| 39 default_android_sdk_build_tools_version = "24.0.2" | 39 default_android_sdk_build_tools_version = "24.0.2" |
| 40 } | 40 } |
| 41 | 41 |
| 42 if (!defined(default_lint_android_sdk_root)) { | 42 if (!defined(default_lint_android_sdk_root)) { |
| 43 # Purposefully repeated so that downstream can change | 43 # Purposefully repeated so that downstream can change |
| 44 # default_android_sdk_root without changing lint version. | 44 # default_android_sdk_root without changing lint version. |
| 45 default_lint_android_sdk_root = "//third_party/android_tools/sdk" | 45 default_lint_android_sdk_root = "//third_party/android_tools/sdk" |
| 46 default_lint_android_sdk_version = "23" | 46 default_lint_android_sdk_version = "24" |
| 47 } | 47 } |
| 48 | 48 |
| 49 if (!defined(default_extras_android_sdk_root)) { | 49 if (!defined(default_extras_android_sdk_root)) { |
| 50 # Purposefully repeated so that downstream can change | 50 # Purposefully repeated so that downstream can change |
| 51 # default_android_sdk_root without changing where we load the SDK extras | 51 # default_android_sdk_root without changing where we load the SDK extras |
| 52 # from. (Google Play services, etc.) | 52 # from. (Google Play services, etc.) |
| 53 default_extras_android_sdk_root = "//third_party/android_tools/sdk" | 53 default_extras_android_sdk_root = "//third_party/android_tools/sdk" |
| 54 } | 54 } |
| 55 | 55 |
| 56 if (!defined(default_android_keystore_path)) { | 56 if (!defined(default_android_keystore_path)) { |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 340 "//build/toolchain/android:android_${android_secondary_abi_cpu}" | 340 "//build/toolchain/android:android_${android_secondary_abi_cpu}" |
| 341 } | 341 } |
| 342 } | 342 } |
| 343 } | 343 } |
| 344 | 344 |
| 345 declare_args() { | 345 declare_args() { |
| 346 # Enables used resource whitelist generation. Set for official builds only | 346 # Enables used resource whitelist generation. Set for official builds only |
| 347 # as a large amount of build output is generated. | 347 # as a large amount of build output is generated. |
| 348 enable_resource_whitelist_generation = is_android && is_official_build | 348 enable_resource_whitelist_generation = is_android && is_official_build |
| 349 } | 349 } |
| OLD | NEW |