diff options
| author | Dan Albert <danalbert@google.com> | 2020-03-16 13:20:28 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2020-03-16 13:20:46 -0700 |
| commit | 06b355dd4f6c233232b4a14291a9a2e213df8a0c (patch) | |
| tree | 27bc5c5f19a0ecab34760269388ca092f62b53cd | |
| parent | 5dc5b29baa3af2533d85c0471a6479037f9392c2 (diff) | |
| download | ndk-06b355dd4f6c233232b4a14291a9a2e213df8a0c.tar.gz | |
Fix issues with the framework bundle.
hdiutil uses the directory given as the root directory, so we need to
pass the directory above the bundle.
Fix the Current symlink to point to the right place.
Test: Built on Linux, inspected symlink. Verifying DMG will have to
wait for the build server.
Bug: None
Change-Id: Ied99ae90376c2c3dd093f646afda2c0f61ed1e9a
| -rwxr-xr-x | ndk/checkbuild.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py index 8395086d1..93e45c302 100755 --- a/ndk/checkbuild.py +++ b/ndk/checkbuild.py @@ -209,7 +209,8 @@ def make_framework_bundle(dmg: Path, ndk_dir: Path, build_number: str, build_dir: The path to the top level build directory. """ framework_name = 'NDK' - bundle_dir = build_dir / f'bundle/AndroidNDK{build_number}.framework' + package_dir = build_dir / 'bundle' + bundle_dir = package_dir / f'AndroidNDK{build_number}.framework' if bundle_dir.exists(): shutil.rmtree(bundle_dir) version_name = get_version_string(build_number) @@ -226,7 +227,7 @@ def make_framework_bundle(dmg: Path, ndk_dir: Path, build_number: str, create_plist(plist, version_name) current_version = versions_dir / 'Current' - current_version.symlink_to(bundled_ndk.relative_to(version_dir), + current_version.symlink_to(version_dir.relative_to(versions_dir), target_is_directory=True) framework_link = bundle_dir / framework_name @@ -237,7 +238,7 @@ def make_framework_bundle(dmg: Path, ndk_dir: Path, build_number: str, resources_link.symlink_to('Versions/Current/Resources', target_is_directory=True) - make_dmg(dmg, f'Android NDK {ndk.config.release}', bundle_dir) + make_dmg(dmg, f'Android NDK {ndk.config.release}', package_dir) def package_ndk(ndk_dir: str, out_dir: str, dist_dir: str, host_tag: str, |