summaryrefslogtreecommitdiffstats
path: root/build/toolchain
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 22:47:42 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-08 22:47:42 +0000
commit9dcbadfa6c23e301a8c21da4cc98b990847ed34f (patch)
tree65a37f12547798a0286581b7c39adcac84ef3f17 /build/toolchain
parent8211021281e9f9e992b14455b2516c80ac2e50d5 (diff)
downloadchromium_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/toolchain')
-rw-r--r--build/toolchain/android/BUILD.gn11
1 files changed, 4 insertions, 7 deletions
diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
index fcb933e..021fdaf 100644
--- a/build/toolchain/android/BUILD.gn
+++ b/build/toolchain/android/BUILD.gn
@@ -2,13 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("../clang.gni")
-import("../goma.gni")
-import("../gcc_toolchain.gni")
-
-# Get the location of the Android tools in our tree.
-android_ndk_root =
- rebase_path("//third_party/android_tools/ndk", ".", "")
+import("//build/config/android/config.gni")
+import("//build/toolchain/clang.gni")
+import("//build/toolchain/goma.gni")
+import("//build/toolchain/gcc_toolchain.gni")
# Get the Android version of the name of the build host's architecture.
if (build_cpu_arch == "x64") {