Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Side by Side Diff: build/config/android/config.gni

Issue 2463143002: Android: Prefix target toolchain names with "android_". (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | build/toolchain/android/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 android_secondary_abi_cpu = "x86" 327 android_secondary_abi_cpu = "x86"
328 android_app_secondary_abi = "x86" 328 android_app_secondary_abi = "x86"
329 } else if (target_cpu == "mips64el") { 329 } else if (target_cpu == "mips64el") {
330 android_secondary_abi_cpu = "mipsel" 330 android_secondary_abi_cpu = "mipsel"
331 android_app_secondary_abi = "mips" 331 android_app_secondary_abi = "mips"
332 } 332 }
333 333
334 if (defined(android_secondary_abi_cpu)) { 334 if (defined(android_secondary_abi_cpu)) {
335 if (is_clang) { 335 if (is_clang) {
336 android_secondary_abi_toolchain = 336 android_secondary_abi_toolchain =
337 "//build/toolchain/android:clang_${android_secondary_abi_cpu}" 337 "//build/toolchain/android:android_clang_${android_secondary_abi_cpu}"
338 } else { 338 } else {
339 android_secondary_abi_toolchain = 339 android_secondary_abi_toolchain =
340 "//build/toolchain/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 }
OLDNEW
« no previous file with comments | « build/config/BUILDCONFIG.gn ('k') | build/toolchain/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698