diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:47:42 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:47:42 +0000 |
| commit | 9dcbadfa6c23e301a8c21da4cc98b990847ed34f (patch) | |
| tree | 65a37f12547798a0286581b7c39adcac84ef3f17 /build/config/sysroot.gni | |
| parent | 8211021281e9f9e992b14455b2516c80ac2e50d5 (diff) | |
| download | chromium_src-9dcbadfa6c23e301a8c21da4cc98b990847ed34f.zip chromium_src-9dcbadfa6c23e301a8c21da4cc98b990847ed34f.tar.gz chromium_src-9dcbadfa6c23e301a8c21da4cc98b990847ed34f.tar.bz2 | |
Work on Android GN build.
Adds arm version and some android configuration build flags.
This adds most of the logic from common.gypi to the Android GN build.
This is currently missing the crtbegin/end stuff and won't actually make real Android builds. The logic in this patch is just the initial conversion that will require testing and several more passes of fixes.
R=torne@chromium.org, torne
Review URL: https://codereview.chromium.org/121173005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243681 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/config/sysroot.gni')
| -rw-r--r-- | build/config/sysroot.gni | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni index ce1c5f2..9080b9b 100644 --- a/build/config/sysroot.gni +++ b/build/config/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 linux 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", ".", "") |