Move toolchain config files back into build.

These aren't really related to the toolchains themselves, they're
information for ndk-build about how to use them. In a modular NDK,
they only need to be available if ndk-build is used, so they should
come with the build system.

Bug: http://b/25231709
Change-Id: I92eb71f263941dee82fe6728f25a1463adbd991c

1 files changed, 0 insertions, 8 deletions

diff --git a/checkbuild.py b/checkbuild.py
index db42db2eb..c25552030 100644
--- a/checkbuild.py
+++ b/checkbuild.py
@@ -52,7 +52,6 @@ ALL_MODULES = {
     'platforms',
     'stlport',
     'tests',
-    'toolchains',
 }
 
 
@@ -422,12 +421,6 @@ def build_gtest(out_dir, _):
                         root_dir=build_support.ndk_path())
 
 
-def build_toolchains(out_dir, _):
-    archive_name = os.path.join(out_dir, 'toolchains')
-    shutil.make_archive(archive_name, 'bztar', base_dir='toolchains',
-                        root_dir=build_support.ndk_path())
-
-
 def build_build(out_dir, _):
     archive_name = os.path.join(out_dir, 'build.tar.bz2')
     root_dir = build_support.ndk_path()
@@ -516,7 +509,6 @@ def main():
         ('platforms', build_platforms),
         ('stlport', build_stlport),
         ('tests', build_tests),
-        ('toolchains', build_toolchains),
     ])
 
     print('Building modules: {}'.format(' '.join(modules)))