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

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

Issue 1406173004: GN: Add an assert for proper output directory nesting on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | no next file » | 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) == "../../",
9 "Android output directory must be nested 2 levels within src/ (" +
10 "e.g.: out-gn/Debug). http://crbug.com/412935")
8 has_chrome_android_internal = 11 has_chrome_android_internal =
9 exec_script("//build/dir_exists.py", 12 exec_script("//build/dir_exists.py",
10 [ rebase_path("//clank", root_build_dir) ], 13 [ rebase_path("//clank", root_build_dir) ],
11 "string") == "True" 14 "string") == "True"
12 15
13 if (has_chrome_android_internal) { 16 if (has_chrome_android_internal) {
14 import("//clank/config.gni") 17 import("//clank/config.gni")
15 } 18 }
16 19
17 if (!defined(default_android_sdk_root)) { 20 if (!defined(default_android_sdk_root)) {
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 } else if (current_cpu == "x64") { 225 } else if (current_cpu == "x64") {
223 android_app_abi = "x86_64" 226 android_app_abi = "x86_64"
224 } else if (current_cpu == "arm64") { 227 } else if (current_cpu == "arm64") {
225 android_app_abi = "arm64-v8a" 228 android_app_abi = "arm64-v8a"
226 } else if (current_cpu == "mips64el") { 229 } else if (current_cpu == "mips64el") {
227 android_app_abi = "mips64" 230 android_app_abi = "mips64"
228 } else { 231 } else {
229 assert(false, "Unknown Android ABI: " + current_cpu) 232 assert(false, "Unknown Android ABI: " + current_cpu)
230 } 233 }
231 } 234 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698