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

Unified Diff: build/config/linux/sysroot.gni

Issue 121173005: Work on Android GN build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | build/gyp_chromium » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/linux/sysroot.gni
diff --git a/build/config/linux/sysroot.gni b/build/config/linux/sysroot.gni
index 4d14915ecdebb6d8c3c7856199b9ea28647cffe0..8ef3fc6cb6fda0f58bdeda230c8cac09f30dc9cd 100644
--- a/build/config/linux/sysroot.gni
+++ b/build/config/linux/sysroot.gni
@@ -5,9 +5,24 @@
# This header file defines the "sysroot" variable which is the absolute path
# of the sysroot. If no sysroot applies, the variable will be an empty string.
-# For official builds, use the sysroot checked into the internal source repo so
-# that the builds work on older versions of Linux.
-if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {
+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"
+ } else if (cpu_arch == "arm") {
+ sysroot = "$android_ndk_root/platforms/android-14/arch-arm"
+ } else if (cpu_arch == "mipsel") {
+ sysroot = "$android_ndk_root/platforms/android-14/arch-mips"
+ } else {
+ sysroot = ""
+ }
+ } else {
+ sysroot = ""
+ }
+} else if (is_linux && is_chrome_branded && is_official_build && !is_chromeos) {
+ # For official builds, use the sysroot checked into the internal source repo
+ # so that the builds work on older versions of Linux.
if (cpu_arch == "x64") {
sysroot = rebase_path(
"//chrome/installer/linux/debian_wheezy_amd64-sysroot", ".", "")
« no previous file with comments | « build/config/linux/BUILD.gn ('k') | build/gyp_chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698