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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: build/config/sysroot.gni
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni
index cecc1eabfeb2c61bd6eede44f9575fa4b9fb8e61..2b04c568895628745a398f046345c2dadaa576e6 100644
--- a/build/config/sysroot.gni
+++ b/build/config/sysroot.gni
@@ -9,11 +9,11 @@ if (is_android) {
import("//build/config/android/config.gni")
if (!is_android_webview_build) {
if (cpu_arch == "x86") {
- sysroot = "$android_ndk_root/platforms/android-14/arch-x86"
+ sysroot = rebase_path("$android_ndk_root/$x86_android_sysroot_subdir")
} else if (cpu_arch == "arm") {
- sysroot = "$android_ndk_root/platforms/android-14/arch-arm"
+ sysroot = rebase_path("$android_ndk_root/$arm_android_sysroot_subdir")
} else if (cpu_arch == "mipsel") {
- sysroot = "$android_ndk_root/platforms/android-14/arch-mips"
+ sysroot = rebase_path("$android_ndk_root/$mips_android_sysroot_subdir")
} else {
sysroot = ""
}

Powered by Google App Engine
This is Rietveld 408576698