diff options
| author | Dan Albert <danalbert@google.com> | 2019-03-25 12:06:26 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2019-03-25 13:23:12 -0700 |
| commit | b406cdb5499a9a7b113d56aabb93160a5884f65b (patch) | |
| tree | 822d2027027afd71b7605d5e61c0b09a5708f425 /build/tools | |
| parent | 1fde54bdf6ac53d4af9465f132bc0cf6ae154929 (diff) | |
| download | ndk-b406cdb5499a9a7b113d56aabb93160a5884f65b.tar.gz | |
Fix bad Windows package name.
get_host_tag doesn't get the host tag for a host, it gets the host
tag associated with a given built NDK. The code paths that inspect
the argument only occur on a Windows host (from the test runner), and
this does return the host tag of the current host on Darwin and
Linux, so the behavior was correct there. My local incremental builds
also didn't detect this error because there was already a Windows
artifact in my out directory that could be packaged.
Test: rm -rf ../out && ./checkbuild.py --system windows
Bug: None
Change-Id: Ia59fafe9e725aaf961b847d23edde20b860e0cfa
Diffstat (limited to 'build/tools')
| -rwxr-xr-x | build/tools/build-renderscript.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/tools/build-renderscript.py b/build/tools/build-renderscript.py index 2f4ae9eaf..3b90a790e 100755 --- a/build/tools/build-renderscript.py +++ b/build/tools/build-renderscript.py @@ -24,7 +24,7 @@ site.addsitedir(os.path.join(os.path.dirname(__file__), '../..')) # pylint: disable=import-error,wrong-import-position import build_support -from ndk.hosts import Host, get_host_tag +from ndk.hosts import Host, host_to_tag # pylint: enable=import-error,wrong-import-position @@ -50,7 +50,7 @@ def main(args) -> None: prebuilt_path = get_rs_prebuilt_path(f'{os_name}-x86') print(f'prebuilt path: {prebuilt_path}') - package_name = f'renderscript-toolchain-{get_host_tag(host)}' + package_name = f'renderscript-toolchain-{host_to_tag(host)}' built_path = os.path.join(prebuilt_path, RS_VERSION) build_support.make_package(package_name, built_path, package_dir) |