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

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

Issue 275703003: Make GN Android build link executables (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 header file defines the "sysroot" variable which is the absolute path 5 # This header file defines the "sysroot" variable which is the absolute path
cjhopman 2014/05/12 18:37:17 One sidenote here: Gyp has a problem where argumen
brettw 2014/05/12 21:00:09 Yeah, GN always says root_build_dir is the current
6 # of the sysroot. If no sysroot applies, the variable will be an empty string. 6 # of the sysroot. If no sysroot applies, the variable will be an empty string.
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 if (!is_android_webview_build) { 10 if (!is_android_webview_build) {
11 if (cpu_arch == "x86") { 11 if (cpu_arch == "x86") {
12 sysroot = "$android_ndk_root/platforms/android-14/arch-x86" 12 sysroot = rebase_path("$android_ndk_root/$x86_android_sysroot_subdir")
13 } else if (cpu_arch == "arm") { 13 } else if (cpu_arch == "arm") {
14 sysroot = "$android_ndk_root/platforms/android-14/arch-arm" 14 sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir")
15 } else if (cpu_arch == "mipsel") { 15 } else if (cpu_arch == "mipsel") {
16 sysroot = "$android_ndk_root/platforms/android-14/arch-mips" 16 sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir")
17 } else { 17 } else {
18 sysroot = "" 18 sysroot = ""
19 } 19 }
20 } else { 20 } else {
21 sysroot = "" 21 sysroot = ""
22 } 22 }
23 } else if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) { 23 } else if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {
24 # For official builds, use the sysroot checked into the internal source repo 24 # For official builds, use the sysroot checked into the internal source repo
25 # so that the builds work on older versions of Linux. 25 # so that the builds work on older versions of Linux.
26 if (cpu_arch == "x64") { 26 if (cpu_arch == "x64") {
(...skipping 14 matching lines...) Expand all
41 } else if (is_mac) { 41 } else if (is_mac) {
42 import("//build/config/mac/mac_sdk.gni") 42 import("//build/config/mac/mac_sdk.gni")
43 43
44 sysroot = mac_sdk_path 44 sysroot = mac_sdk_path
45 } else if (is_ios) { 45 } else if (is_ios) {
46 import("//build/config/ios/ios_sdk.gni") 46 import("//build/config/ios/ios_sdk.gni")
47 sysroot = ios_sdk_path 47 sysroot = ios_sdk_path
48 } else { 48 } else {
49 sysroot = "" 49 sysroot = ""
50 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698