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

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

Issue 2288273002: Fix imports in gcc_toolchain.gni to not rely on //tools. (Closed)
Patch Set: Address dpranke comments Created 4 years, 3 months 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 | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | build/toolchain/gcc_toolchain.gni » ('J')
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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 if (defined(android_secondary_abi_cpu)) { 316 if (defined(android_secondary_abi_cpu)) {
317 if (is_clang) { 317 if (is_clang) {
318 android_secondary_abi_toolchain = 318 android_secondary_abi_toolchain =
319 "//build/toolchain/android:clang_${android_secondary_abi_cpu}" 319 "//build/toolchain/android:clang_${android_secondary_abi_cpu}"
320 } else { 320 } else {
321 android_secondary_abi_toolchain = 321 android_secondary_abi_toolchain =
322 "//build/toolchain/android:${android_secondary_abi_cpu}" 322 "//build/toolchain/android:${android_secondary_abi_cpu}"
323 } 323 }
324 } 324 }
325 } 325 }
326
327 declare_args() {
328 # Enables used resource whitelist generation. Set for official builds only
329 # as a large amount of build output is generated.
330 enable_resource_whitelist_generation = is_android && is_official_build
331 }
OLDNEW
« no previous file with comments | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | build/toolchain/gcc_toolchain.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698