Merge "Merge cherrypicks of [1305537, 1305538] into ndk-release-r21" into ndk-release-r21
diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py
index 823fb15..a699b7f 100755
--- a/ndk/checkbuild.py
+++ b/ndk/checkbuild.py
@@ -289,7 +289,10 @@
bundle_path = Path(dist_dir) / bundle_name
make_app_bundle(bundle_path, Path(ndk_dir), build_number,
Path(out_dir))
- return _make_zip_package(package_path, base_dir, [package_files])
+ if host_tag.startswith('windows'):
+ return _make_zip_package(package_path, base_dir, [package_files])
+ else:
+ return _make_tar_package(package_path, base_dir, package_files)
def build_ndk_tests(out_dir: str, dist_dir: str,
diff --git a/ndk/config.py b/ndk/config.py
index dbf3ace..096b3b4 100644
--- a/ndk/config.py
+++ b/ndk/config.py
@@ -2,7 +2,7 @@
major = 21
-hotfix = 1
+hotfix = 2
hotfix_str = chr(ord('a') + hotfix) if hotfix else ''
beta = 0
beta_str = '-beta{}'.format(beta) if beta > 0 else ''
