diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-12 22:14:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-12 22:14:37 +0000 |
| commit | 198356f05fdf56f33f5d19a1b28a9f6463f38669 (patch) | |
| tree | eb8160b408167b561d053500b4666e2ef2fbeae4 /checkbuild.py | |
| parent | e9bd744358dd38ff7e75042fb589b0106b7294b4 (diff) | |
| parent | bdf77671e1bcb7dcd635be7b52953ee096ed507c (diff) | |
| download | ndk-198356f05fdf56f33f5d19a1b28a9f6463f38669.tar.gz | |
Merge "Install yasm to the new toolchain."
Diffstat (limited to 'checkbuild.py')
| -rwxr-xr-x | checkbuild.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/checkbuild.py b/checkbuild.py index 8054529dc..0e6bbada2 100755 --- a/checkbuild.py +++ b/checkbuild.py @@ -642,19 +642,22 @@ class HostTools(ndk.builds.Module): path = 'prebuilt/{host}' notice_group = ndk.builds.NoticeGroup.TOOLCHAIN + yasm_notices = [ + ndk.paths.android_path('toolchain/yasm/Artistic.txt'), + ndk.paths.android_path('toolchain/yasm/BSD.txt'), + ndk.paths.android_path('toolchain/yasm/COPYING'), + ndk.paths.android_path('toolchain/yasm/GNU_GPL-2.0'), + ndk.paths.android_path('toolchain/yasm/GNU_LGPL-2.0'), + ] + @property def notices(self): return [ ndk.paths.android_path('toolchain/gdb/gdb-7.11/COPYING'), ndk.paths.android_path('toolchain/python/Python-2.7.5/LICENSE'), - ndk.paths.android_path('toolchain/yasm/Artistic.txt'), - ndk.paths.android_path('toolchain/yasm/BSD.txt'), - ndk.paths.android_path('toolchain/yasm/COPYING'), - ndk.paths.android_path('toolchain/yasm/GNU_GPL-2.0'), - ndk.paths.android_path('toolchain/yasm/GNU_LGPL-2.0'), ndk.paths.ndk_path('sources/host-tools/make-3.81/COPYING'), ndk.paths.ndk_path('sources/host-tools/toolbox/NOTICE'), - ] + ] + self.yasm_notices def build(self): build_args = ndk.builds.common_build_args(self.out_dir, self.dist_dir, @@ -1493,6 +1496,7 @@ class BaseToolchain(ndk.builds.Module): deps = { 'binutils', 'clang', + 'host-tools', 'libandroid_support', 'platforms', 'sysroot', @@ -1501,7 +1505,8 @@ class BaseToolchain(ndk.builds.Module): @property def notices(self): - return (Binutils().notices + Clang().notices + Platforms().notices + + return (Binutils().notices + Clang().notices + HostTools().yasm_notices + + LibAndroidSupport().notices + Platforms().notices + Sysroot().notices + SystemStl().notices) def build(self): @@ -1510,6 +1515,7 @@ class BaseToolchain(ndk.builds.Module): def install(self): install_dir = self.get_install_path() clang_dir = self.get_dep('clang').get_install_path() + host_tools_dir = self.get_dep('host-tools').get_install_path() libandroid_support_dir = self.get_dep( 'libandroid_support').get_install_path() platforms_dir = self.get_dep('platforms').get_install_path() @@ -1522,6 +1528,11 @@ class BaseToolchain(ndk.builds.Module): copy_tree(clang_dir, install_dir) copy_tree(sysroot_dir, os.path.join(install_dir, 'sysroot')) + exe = '.exe' if self.host.startswith('windows') else '' + shutil.copy2( + os.path.join(host_tools_dir, 'bin', 'yasm' + exe), + os.path.join(install_dir, 'bin')) + for arch in self.arches: binutils_dir = self.get_dep('binutils').get_install_path(arch=arch) copy_tree(binutils_dir, install_dir) @@ -1672,8 +1683,7 @@ class Toolchain(ndk.builds.Module): @property def notices(self): - return (Libcxx().notices + Libcxxabi().notices + - LibAndroidSupport().notices) + return Libcxx().notices + Libcxxabi().notices def build(self): pass |