diff options
author | Dan Albert <danalbert@google.com> | 2015-11-16 13:46:55 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2015-11-16 13:46:55 -0800 |
commit | e1fe348947ebd50fb613e9aee01daee8139cdfd6 (patch) | |
tree | b7f2ddd033ab992a2655e47bf118927516e52a7e /checkbuild.py | |
parent | 141a24114faa49489460c08f12eb5d380b8fd939 (diff) | |
download | ndk-e1fe348947ebd50fb613e9aee01daee8139cdfd6.tar.gz |
Move ndk-gdb into the host-tools package.
Bug: http://b/25454836
Change-Id: I30f4f44a6a3fefb977bc94111adfb3edc28d6ee6
Diffstat (limited to 'checkbuild.py')
-rw-r--r-- | checkbuild.py | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/checkbuild.py b/checkbuild.py index edfdb5982..6ed2b6207 100644 --- a/checkbuild.py +++ b/checkbuild.py @@ -379,6 +379,12 @@ def package_host_tools(out_dir, host): 'ndk-yasm', ] + files = [ + 'ndk-gdb', + 'ndk-gdb.cmd', + 'ndk-gdb.py', + ] + if host in ('windows', 'windows64'): packages.append('toolbox') @@ -390,6 +396,10 @@ def package_host_tools(out_dir, host): for package_name in package_names: package_path = os.path.join(out_dir, package_name) subprocess.check_call(['tar', 'xf', package_path, '-C', temp_dir]) + + for f in files: + shutil.copy2(f, os.path.join(temp_dir, 'prebuilt/bin')) + package_name = 'host-tools-' + host_tag build_support.make_package(package_name, ['prebuilt'], out_dir, temp_dir, repo_prop_dir='prebuilt') @@ -480,28 +490,14 @@ def build_build(out_dir, _): repo_prop_dir='build') def build_python_packages(out_dir, _): - root_dir = build_support.ndk_path() - files = [ - 'ndk-gdb', - 'ndk-gdb.cmd', - 'ndk-gdb.py', - '../development/python-packages', - ] - # Stage the files in a temporary directory to make things easier. temp_dir = tempfile.mkdtemp() - def copy(path): - if os.path.isdir(path): - shutil.copytree(path, os.path.join(temp_dir, os.path.basename(path))) - else: - shutil.copy(path, temp_dir) - try: - files = [os.path.join(root_dir, path) for path in files] - for f in files: - copy(f) - files = [os.path.basename(path) for path in files] - build_support.make_package('python-packages', files, out_dir, temp_dir, + shutil.copytree( + build_support.android_path('development/python-packages'), + os.path.join(temp_dir, 'python-packages')) + build_support.make_package('python-packages', ['python-packages'], + out_dir, temp_dir, repo_prop_dir='python-packages') finally: shutil.rmtree(temp_dir) |