Pin the media plane, now that there is a release to pin
jolt-native v0.1.3 carries libjoltmoq.so beside libvidya.so, so the APK no longer needs a sibling checkout to have a call in it. The branch that made the media plane conditional goes with it. Both objects come out of one tarball and one digest, deliberately: they are built together and libjoltapp links both, so a libjoltmoq from one release beside a libvidya from another is a pairing nothing has tested. The two macros read the same config key for the same reason. The glue moves to v0.1.3 too, and has to — jolt_main.c includes joltmoq.h now, registers the media plane's symbols with Chez, and hands it the JavaVM and the Activity that only libvidya receives. Verified by building with no checkout in sight: the APK comes out carrying libvidya, libjoltmoq, libc++_shared and the CameraCapture dex. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
03d5a6b parent: 43ada0b modified
android/BUCK +7 -14 | @@ -70,10 +70,8 @@ export_file( | ||
| 70 | 70 | # The recipe decides which, by whether that checkout exists, and says so here. |
| 71 | 71 | libvidya(name = "libvidya") |
| 72 | 72 | |
| 73 | -# The media plane, on the same terms — see the macro for why it can be absent. | |
| 74 | -# `_MOQ` is False for a pinned build, and every use of it below falls back to | |
| 75 | -# the APK this repo shipped before the media plane crossed. | |
| 76 | -_MOQ = libjoltmoq(name = "libjoltmoq") | |
| 73 | +# The media plane, on the same terms and from the same release. | |
| 74 | +libjoltmoq(name = "libjoltmoq") | |
| 77 | 75 | |
| 78 | 76 | glue(c_name = "glue-c", include_name = "glue-include") |
| 79 | 77 | |
| @@ -146,7 +144,7 @@ genrule( | ||
| 146 | 144 | out = "libjoltapp.so", |
| 147 | 145 | cmd = _ABS_OUT + " && lib=`mktemp -d` && " + |
| 148 | 146 | "cp $(location :libvidya) \"$lib/libvidya.so\" && " + |
| 149 | - ("cp $(location :libjoltmoq) \"$lib/libjoltmoq.so\" && " if _MOQ else "") + | |
| 147 | + "cp $(location :libjoltmoq) \"$lib/libjoltmoq.so\" && " + | |
| 150 | 148 | _CC + " -shared -fPIC -O2 -o \"$out\" " + |
| 151 | 149 | _GLUE_C + " " + |
| 152 | 150 | "$(location :jolt-boot-obj) " + |
| @@ -155,8 +153,7 @@ genrule( | ||
| 155 | 153 | "-L\"$lib\" " + |
| 156 | 154 | _CHEZ + "/tarm64le/boot/tarm64le/libkernel.a " + |
| 157 | 155 | _CHEZ + "/lz4/lib/liblz4.a " + |
| 158 | - "-lvidya " + ("-ljoltmoq " if _MOQ else "") + | |
| 159 | - "-landroid -llog -lz -ldl -lm -Wl,--no-undefined && " + | |
| 156 | + "-lvidya -ljoltmoq -landroid -llog -lz -ldl -lm -Wl,--no-undefined && " + | |
| 160 | 157 | "rm -rf \"$lib\"", |
| 161 | 158 | ) |
| 162 | 159 | |
| @@ -166,10 +163,6 @@ genrule( | ||
| 166 | 163 | # opens the camera in Java and pushes NV12 planes down to libjoltmoq over JNI. |
| 167 | 164 | # android.jar on the class path is where every android.* type comes from; the |
| 168 | 165 | # JDK's own java.* is what is left. |
| 169 | -# | |
| 170 | -# CameraCapture is compiled whether or not the media plane is packaged. It is a | |
| 171 | -# few kilobytes of dex, and a class nothing loads costs nothing; keeping it out | |
| 172 | -# of the `_MOQ` branch keeps the branch to the two things that actually differ. | |
| 173 | 166 | genrule( |
| 174 | 167 | name = "classes-dex", |
| 175 | 168 | out = "classes.dex", |
| @@ -195,15 +188,15 @@ genrule( | ||
| 195 | 188 | "mkdir -p \"$stage/lib/arm64-v8a\" && " + |
| 196 | 189 | "cp $(location :libvidya) \"$stage/lib/arm64-v8a/libvidya.so\" && " + |
| 197 | 190 | "cp $(location :libjoltapp) \"$stage/lib/arm64-v8a/libjoltapp.so\" && " + |
| 198 | - ("cp $(location :libjoltmoq) \"$stage/lib/arm64-v8a/libjoltmoq.so\" && " if _MOQ else "") + | |
| 199 | - ("cp $(location :libcxx) \"$stage/lib/arm64-v8a/libc++_shared.so\" && " if _MOQ else "") + | |
| 191 | + "cp $(location :libjoltmoq) \"$stage/lib/arm64-v8a/libjoltmoq.so\" && " + | |
| 192 | + "cp $(location :libcxx) \"$stage/lib/arm64-v8a/libc++_shared.so\" && " + | |
| 200 | 193 | "cp " + _OPENSSL + "/libssl.so " + _OPENSSL + "/libcrypto.so \"$stage/lib/arm64-v8a/\" && " + |
| 201 | 194 | "cp $(location :classes-dex) \"$stage/classes.dex\" && " + |
| 202 | 195 | _TOOLS + "/aapt2 link -o \"$out\" -I " + _ANDROID_JAR + " " + |
| 203 | 196 | "--manifest $SRCS --min-sdk-version " + _API + " --target-sdk-version 36 " + |
| 204 | 197 | "--version-code 1 --version-name 0.1.0 >&2 && " + |
| 205 | 198 | "( cd \"$stage\" && zip -q -0 \"$out\" lib/arm64-v8a/libvidya.so " + |
| 206 | - ("lib/arm64-v8a/libjoltmoq.so lib/arm64-v8a/libc++_shared.so " if _MOQ else "") + | |
| 199 | + "lib/arm64-v8a/libjoltmoq.so lib/arm64-v8a/libc++_shared.so " + | |
| 207 | 200 | "lib/arm64-v8a/libjoltapp.so lib/arm64-v8a/libssl.so lib/arm64-v8a/libcrypto.so && " + |
| 208 | 201 | "zip -q \"$out\" classes.dex ) && rm -rf \"$stage\"", |
| 209 | 202 | ) |
| @@ -70,10 +70,8 @@ export_file( | |||
| 70 | # The recipe decides which, by whether that checkout exists, and says so here. | 70 | # The recipe decides which, by whether that checkout exists, and says so here. |
| 71 | libvidya(name = "libvidya") | 71 | libvidya(name = "libvidya") |
| 72 | 72 | ||
| 73 | -# The media plane, on the same terms — see the macro for why it can be absent. | 73 | +# The media plane, on the same terms and from the same release. |
| 74 | -# `_MOQ` is False for a pinned build, and every use of it below falls back to | 74 | +libjoltmoq(name = "libjoltmoq") |
| 75 | -# the APK this repo shipped before the media plane crossed. | ||
| 76 | -_MOQ = libjoltmoq(name = "libjoltmoq") | ||
| 77 | 75 | ||
| 78 | glue(c_name = "glue-c", include_name = "glue-include") | 76 | glue(c_name = "glue-c", include_name = "glue-include") |
| 79 | 77 | ||
| @@ -146,7 +144,7 @@ genrule( | |||
| 146 | out = "libjoltapp.so", | 144 | out = "libjoltapp.so", |
| 147 | cmd = _ABS_OUT + " && lib=`mktemp -d` && " + | 145 | cmd = _ABS_OUT + " && lib=`mktemp -d` && " + |
| 148 | "cp $(location :libvidya) \"$lib/libvidya.so\" && " + | 146 | "cp $(location :libvidya) \"$lib/libvidya.so\" && " + |
| 149 | - ("cp $(location :libjoltmoq) \"$lib/libjoltmoq.so\" && " if _MOQ else "") + | 147 | + "cp $(location :libjoltmoq) \"$lib/libjoltmoq.so\" && " + |
| 150 | _CC + " -shared -fPIC -O2 -o \"$out\" " + | 148 | _CC + " -shared -fPIC -O2 -o \"$out\" " + |
| 151 | _GLUE_C + " " + | 149 | _GLUE_C + " " + |
| 152 | "$(location :jolt-boot-obj) " + | 150 | "$(location :jolt-boot-obj) " + |
| @@ -155,8 +153,7 @@ genrule( | |||
| 155 | "-L\"$lib\" " + | 153 | "-L\"$lib\" " + |
| 156 | _CHEZ + "/tarm64le/boot/tarm64le/libkernel.a " + | 154 | _CHEZ + "/tarm64le/boot/tarm64le/libkernel.a " + |
| 157 | _CHEZ + "/lz4/lib/liblz4.a " + | 155 | _CHEZ + "/lz4/lib/liblz4.a " + |
| 158 | - "-lvidya " + ("-ljoltmoq " if _MOQ else "") + | 156 | + "-lvidya -ljoltmoq -landroid -llog -lz -ldl -lm -Wl,--no-undefined && " + |
| 159 | - "-landroid -llog -lz -ldl -lm -Wl,--no-undefined && " + | ||
| 160 | "rm -rf \"$lib\"", | 157 | "rm -rf \"$lib\"", |
| 161 | ) | 158 | ) |
| 162 | 159 | ||
| @@ -166,10 +163,6 @@ genrule( | |||
| 166 | # opens the camera in Java and pushes NV12 planes down to libjoltmoq over JNI. | 163 | # opens the camera in Java and pushes NV12 planes down to libjoltmoq over JNI. |
| 167 | # android.jar on the class path is where every android.* type comes from; the | 164 | # android.jar on the class path is where every android.* type comes from; the |
| 168 | # JDK's own java.* is what is left. | 165 | # JDK's own java.* is what is left. |
| 169 | -# | ||
| 170 | -# CameraCapture is compiled whether or not the media plane is packaged. It is a | ||
| 171 | -# few kilobytes of dex, and a class nothing loads costs nothing; keeping it out | ||
| 172 | -# of the `_MOQ` branch keeps the branch to the two things that actually differ. | ||
| 173 | genrule( | 166 | genrule( |
| 174 | name = "classes-dex", | 167 | name = "classes-dex", |
| 175 | out = "classes.dex", | 168 | out = "classes.dex", |
| @@ -195,15 +188,15 @@ genrule( | |||
| 195 | "mkdir -p \"$stage/lib/arm64-v8a\" && " + | 188 | "mkdir -p \"$stage/lib/arm64-v8a\" && " + |
| 196 | "cp $(location :libvidya) \"$stage/lib/arm64-v8a/libvidya.so\" && " + | 189 | "cp $(location :libvidya) \"$stage/lib/arm64-v8a/libvidya.so\" && " + |
| 197 | "cp $(location :libjoltapp) \"$stage/lib/arm64-v8a/libjoltapp.so\" && " + | 190 | "cp $(location :libjoltapp) \"$stage/lib/arm64-v8a/libjoltapp.so\" && " + |
| 198 | - ("cp $(location :libjoltmoq) \"$stage/lib/arm64-v8a/libjoltmoq.so\" && " if _MOQ else "") + | 191 | + "cp $(location :libjoltmoq) \"$stage/lib/arm64-v8a/libjoltmoq.so\" && " + |
| 199 | - ("cp $(location :libcxx) \"$stage/lib/arm64-v8a/libc++_shared.so\" && " if _MOQ else "") + | 192 | + "cp $(location :libcxx) \"$stage/lib/arm64-v8a/libc++_shared.so\" && " + |
| 200 | "cp " + _OPENSSL + "/libssl.so " + _OPENSSL + "/libcrypto.so \"$stage/lib/arm64-v8a/\" && " + | 193 | "cp " + _OPENSSL + "/libssl.so " + _OPENSSL + "/libcrypto.so \"$stage/lib/arm64-v8a/\" && " + |
| 201 | "cp $(location :classes-dex) \"$stage/classes.dex\" && " + | 194 | "cp $(location :classes-dex) \"$stage/classes.dex\" && " + |
| 202 | _TOOLS + "/aapt2 link -o \"$out\" -I " + _ANDROID_JAR + " " + | 195 | _TOOLS + "/aapt2 link -o \"$out\" -I " + _ANDROID_JAR + " " + |
| 203 | "--manifest $SRCS --min-sdk-version " + _API + " --target-sdk-version 36 " + | 196 | "--manifest $SRCS --min-sdk-version " + _API + " --target-sdk-version 36 " + |
| 204 | "--version-code 1 --version-name 0.1.0 >&2 && " + | 197 | "--version-code 1 --version-name 0.1.0 >&2 && " + |
| 205 | "( cd \"$stage\" && zip -q -0 \"$out\" lib/arm64-v8a/libvidya.so " + | 198 | "( cd \"$stage\" && zip -q -0 \"$out\" lib/arm64-v8a/libvidya.so " + |
| 206 | - ("lib/arm64-v8a/libjoltmoq.so lib/arm64-v8a/libc++_shared.so " if _MOQ else "") + | 199 | + "lib/arm64-v8a/libjoltmoq.so lib/arm64-v8a/libc++_shared.so " + |
| 207 | "lib/arm64-v8a/libjoltapp.so lib/arm64-v8a/libssl.so lib/arm64-v8a/libcrypto.so && " + | 200 | "lib/arm64-v8a/libjoltapp.so lib/arm64-v8a/libssl.so lib/arm64-v8a/libcrypto.so && " + |
| 208 | "zip -q \"$out\" classes.dex ) && rm -rf \"$stage\"", | 201 | "zip -q \"$out\" classes.dex ) && rm -rf \"$stage\"", |
| 209 | ) | 202 | ) |
modified
android/defs.bzl +17 -18 | @@ -28,26 +28,25 @@ def libvidya(name): | ||
| 28 | 28 | ) |
| 29 | 29 | |
| 30 | 30 | def libjoltmoq(name): |
| 31 | - """The Android libjoltmoq, or nothing. | |
| 31 | + """The Android libjoltmoq: a sibling checkout's, or the pinned release's. | |
| 32 | 32 | |
| 33 | - The media plane crosses to the phone now, but only out of a sibling | |
| 34 | - jolt-native checkout: the pinned v0.1.1 release predates it and carries no | |
| 35 | - such object. Returns True when the APK should package it. | |
| 36 | - | |
| 37 | - The two halves cannot disagree, and do not: the pinned glue is the same | |
| 38 | - v0.1.1 and never mentions joltmoq either, so a pinned APK is consistently | |
| 39 | - without a media plane rather than half-wired. Delete the branch — and make | |
| 40 | - the caller unconditional — once jolt-native cuts a release carrying | |
| 41 | - libjoltmoq.so and scripts/libjoltmoq-android.dotslash pins it. | |
| 33 | + The same two answers as libvidya, and necessarily the same one — the two | |
| 34 | + objects are built together, libjoltapp links both, and pairing one release's | |
| 35 | + media plane with another's UI is a combination nothing has tested. Both | |
| 36 | + macros read the same config key, so they cannot disagree. | |
| 42 | 37 | """ |
| 43 | - if native.read_root_config("frq", "libvidya", "pinned") != "checkout": | |
| 44 | - return False | |
| 45 | - native.export_file( | |
| 46 | - name = name, | |
| 47 | - src = "prebuilt/arm64-v8a/libjoltmoq.so", | |
| 48 | - mode = "reference", | |
| 49 | - ) | |
| 50 | - return True | |
| 38 | + if native.read_root_config("frq", "libvidya", "pinned") == "checkout": | |
| 39 | + native.export_file( | |
| 40 | + name = name, | |
| 41 | + src = "prebuilt/arm64-v8a/libjoltmoq.so", | |
| 42 | + mode = "reference", | |
| 43 | + ) | |
| 44 | + else: | |
| 45 | + native.genrule( | |
| 46 | + name = name, | |
| 47 | + out = "libjoltmoq.so", | |
| 48 | + cmd = "cp $(location toolchains//dist:libjoltmoq-android)/libjoltmoq.so \"$OUT\"", | |
| 49 | + ) | |
| 51 | 50 | |
| 52 | 51 | def glue(c_name, include_name): |
| 53 | 52 | """jolt_main.c and the ABI's headers, from wherever libvidya came from. |
| @@ -28,26 +28,25 @@ def libvidya(name): | |||
| 28 | ) | 28 | ) |
| 29 | 29 | ||
| 30 | def libjoltmoq(name): | 30 | def libjoltmoq(name): |
| 31 | - """The Android libjoltmoq, or nothing. | 31 | + """The Android libjoltmoq: a sibling checkout's, or the pinned release's. |
| 32 | 32 | ||
| 33 | - The media plane crosses to the phone now, but only out of a sibling | 33 | + The same two answers as libvidya, and necessarily the same one — the two |
| 34 | - jolt-native checkout: the pinned v0.1.1 release predates it and carries no | 34 | + objects are built together, libjoltapp links both, and pairing one release's |
| 35 | - such object. Returns True when the APK should package it. | 35 | + media plane with another's UI is a combination nothing has tested. Both |
| 36 | - | 36 | + macros read the same config key, so they cannot disagree. |
| 37 | - The two halves cannot disagree, and do not: the pinned glue is the same | ||
| 38 | - v0.1.1 and never mentions joltmoq either, so a pinned APK is consistently | ||
| 39 | - without a media plane rather than half-wired. Delete the branch — and make | ||
| 40 | - the caller unconditional — once jolt-native cuts a release carrying | ||
| 41 | - libjoltmoq.so and scripts/libjoltmoq-android.dotslash pins it. | ||
| 42 | """ | 37 | """ |
| 43 | - if native.read_root_config("frq", "libvidya", "pinned") != "checkout": | 38 | + if native.read_root_config("frq", "libvidya", "pinned") == "checkout": |
| 44 | - return False | 39 | + native.export_file( |
| 45 | - native.export_file( | 40 | + name = name, |
| 46 | - name = name, | 41 | + src = "prebuilt/arm64-v8a/libjoltmoq.so", |
| 47 | - src = "prebuilt/arm64-v8a/libjoltmoq.so", | 42 | + mode = "reference", |
| 48 | - mode = "reference", | 43 | + ) |
| 49 | - ) | 44 | + else: |
| 50 | - return True | 45 | + native.genrule( |
| 46 | + name = name, | ||
| 47 | + out = "libjoltmoq.so", | ||
| 48 | + cmd = "cp $(location toolchains//dist:libjoltmoq-android)/libjoltmoq.so \"$OUT\"", | ||
| 49 | + ) | ||
| 51 | 50 | ||
| 52 | def glue(c_name, include_name): | 51 | def glue(c_name, include_name): |
| 53 | """jolt_main.c and the ABI's headers, from wherever libvidya came from. | 52 | """jolt_main.c and the ABI's headers, from wherever libvidya came from. |
modified
scripts/android-glue.dotslash +13 -13 | @@ -1,6 +1,6 @@ | ||
| 1 | 1 | #!/usr/bin/env dotslash |
| 2 | 2 | |
| 3 | -// The NativeActivity glue and the ABI's headers, from jolt-native's v0.1.2 | |
| 3 | +// The NativeActivity glue and the ABI's headers, from jolt-native's v0.1.3 | |
| 4 | 4 | // release. |
| 5 | 5 | // |
| 6 | 6 | // jolt_main.c is what libvidya's android_main dlopens: it boots Chez over the |
| @@ -15,50 +15,50 @@ | ||
| 15 | 15 | "name": "android-glue", |
| 16 | 16 | "platforms": { |
| 17 | 17 | "linux-x86_64": { |
| 18 | - "size": 6812, | |
| 18 | + "size": 10652, | |
| 19 | 19 | "hash": "sha256", |
| 20 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 20 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 21 | 21 | "format": "tar.gz", |
| 22 | 22 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 23 | 23 | "providers": [ |
| 24 | 24 | { |
| 25 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | |
| 25 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" | |
| 26 | 26 | } |
| 27 | 27 | ] |
| 28 | 28 | }, |
| 29 | 29 | "linux-aarch64": { |
| 30 | - "size": 6812, | |
| 30 | + "size": 10652, | |
| 31 | 31 | "hash": "sha256", |
| 32 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 32 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 33 | 33 | "format": "tar.gz", |
| 34 | 34 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 35 | 35 | "providers": [ |
| 36 | 36 | { |
| 37 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | |
| 37 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" | |
| 38 | 38 | } |
| 39 | 39 | ] |
| 40 | 40 | }, |
| 41 | 41 | "macos-x86_64": { |
| 42 | - "size": 6812, | |
| 42 | + "size": 10652, | |
| 43 | 43 | "hash": "sha256", |
| 44 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 44 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 45 | 45 | "format": "tar.gz", |
| 46 | 46 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 47 | 47 | "providers": [ |
| 48 | 48 | { |
| 49 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | |
| 49 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" | |
| 50 | 50 | } |
| 51 | 51 | ] |
| 52 | 52 | }, |
| 53 | 53 | "macos-aarch64": { |
| 54 | - "size": 6812, | |
| 54 | + "size": 10652, | |
| 55 | 55 | "hash": "sha256", |
| 56 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 56 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 57 | 57 | "format": "tar.gz", |
| 58 | 58 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 59 | 59 | "providers": [ |
| 60 | 60 | { |
| 61 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | |
| 61 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" | |
| 62 | 62 | } |
| 63 | 63 | ] |
| 64 | 64 | } |
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/env dotslash | 1 | #!/usr/bin/env dotslash |
| 2 | 2 | ||
| 3 | -// The NativeActivity glue and the ABI's headers, from jolt-native's v0.1.2 | 3 | +// The NativeActivity glue and the ABI's headers, from jolt-native's v0.1.3 |
| 4 | // release. | 4 | // release. |
| 5 | // | 5 | // |
| 6 | // jolt_main.c is what libvidya's android_main dlopens: it boots Chez over the | 6 | // jolt_main.c is what libvidya's android_main dlopens: it boots Chez over the |
| @@ -15,50 +15,50 @@ | |||
| 15 | "name": "android-glue", | 15 | "name": "android-glue", |
| 16 | "platforms": { | 16 | "platforms": { |
| 17 | "linux-x86_64": { | 17 | "linux-x86_64": { |
| 18 | - "size": 6812, | 18 | + "size": 10652, |
| 19 | "hash": "sha256", | 19 | "hash": "sha256", |
| 20 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 20 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 21 | "format": "tar.gz", | 21 | "format": "tar.gz", |
| 22 | "path": "jolt-native-android-glue/android/jolt_main.c", | 22 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 23 | "providers": [ | 23 | "providers": [ |
| 24 | { | 24 | { |
| 25 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | 25 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" |
| 26 | } | 26 | } |
| 27 | ] | 27 | ] |
| 28 | }, | 28 | }, |
| 29 | "linux-aarch64": { | 29 | "linux-aarch64": { |
| 30 | - "size": 6812, | 30 | + "size": 10652, |
| 31 | "hash": "sha256", | 31 | "hash": "sha256", |
| 32 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 32 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 33 | "format": "tar.gz", | 33 | "format": "tar.gz", |
| 34 | "path": "jolt-native-android-glue/android/jolt_main.c", | 34 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 35 | "providers": [ | 35 | "providers": [ |
| 36 | { | 36 | { |
| 37 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | 37 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" |
| 38 | } | 38 | } |
| 39 | ] | 39 | ] |
| 40 | }, | 40 | }, |
| 41 | "macos-x86_64": { | 41 | "macos-x86_64": { |
| 42 | - "size": 6812, | 42 | + "size": 10652, |
| 43 | "hash": "sha256", | 43 | "hash": "sha256", |
| 44 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 44 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 45 | "format": "tar.gz", | 45 | "format": "tar.gz", |
| 46 | "path": "jolt-native-android-glue/android/jolt_main.c", | 46 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 47 | "providers": [ | 47 | "providers": [ |
| 48 | { | 48 | { |
| 49 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | 49 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" |
| 50 | } | 50 | } |
| 51 | ] | 51 | ] |
| 52 | }, | 52 | }, |
| 53 | "macos-aarch64": { | 53 | "macos-aarch64": { |
| 54 | - "size": 6812, | 54 | + "size": 10652, |
| 55 | "hash": "sha256", | 55 | "hash": "sha256", |
| 56 | - "digest": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 56 | + "digest": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 57 | "format": "tar.gz", | 57 | "format": "tar.gz", |
| 58 | "path": "jolt-native-android-glue/android/jolt_main.c", | 58 | "path": "jolt-native-android-glue/android/jolt_main.c", |
| 59 | "providers": [ | 59 | "providers": [ |
| 60 | { | 60 | { |
| 61 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz" | 61 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz" |
| 62 | } | 62 | } |
| 63 | ] | 63 | ] |
| 64 | } | 64 | } |
modified
scripts/dotslash-to-buck +3 -0 | @@ -35,6 +35,9 @@ exec "$(dirname "$0")/bb" "$0" "$@" | ||
| 35 | 35 | ;; jolt-native's release, so the APK's UI half and the Jolt side of the |
| 36 | 36 | ;; tree ABI are fetched rather than built out of a second checkout. |
| 37 | 37 | "libvidya-android" |
| 38 | + ;; The media plane, out of the same tarball as libvidya — see its manifest | |
| 39 | + ;; for why the two are pinned together rather than independently. | |
| 40 | + "libjoltmoq-android" | |
| 38 | 41 | "glimmer-vidya" |
| 39 | 42 | "android-glue"]) |
| 40 | 43 | |
| @@ -35,6 +35,9 @@ exec "$(dirname "$0")/bb" "$0" "$@" | |||
| 35 | ;; jolt-native's release, so the APK's UI half and the Jolt side of the | 35 | ;; jolt-native's release, so the APK's UI half and the Jolt side of the |
| 36 | ;; tree ABI are fetched rather than built out of a second checkout. | 36 | ;; tree ABI are fetched rather than built out of a second checkout. |
| 37 | "libvidya-android" | 37 | "libvidya-android" |
| 38 | + ;; The media plane, out of the same tarball as libvidya — see its manifest | ||
| 39 | + ;; for why the two are pinned together rather than independently. | ||
| 40 | + "libjoltmoq-android" | ||
| 38 | "glimmer-vidya" | 41 | "glimmer-vidya" |
| 39 | "android-glue"]) | 42 | "android-glue"]) |
| 40 | 43 | ||
added
scripts/libjoltmoq-android.dotslash +67 -0 | new file mode 100755 | ||
| @@ -0,0 +1,67 @@ | ||
| 1 | +#!/usr/bin/env dotslash | |
| 2 | + | |
| 3 | +// The AV media plane for the phone, from jolt-native's v0.1.3 release. | |
| 4 | +// | |
| 5 | +// The same tarball libvidya-android names, and deliberately so: the two objects | |
| 6 | +// are built together and only make sense together — libjoltapp links both, and | |
| 7 | +// a libjoltmoq from one release beside a libvidya from another is a pairing | |
| 8 | +// nothing has tested. Same digest, different file out of it. | |
| 9 | +// | |
| 10 | +// Before v0.1.3 there was no such object at all: the media plane was V4L2 and | |
| 11 | +// PipeWire, which a phone has neither of. The camera is Camera2 over JNI now | |
| 12 | +// and the microphone is cpal's AAudio host. | |
| 13 | +// | |
| 14 | +// A sibling jolt-native checkout still wins over this, the same as libvidya. | |
| 15 | +{ | |
| 16 | + "name": "libjoltmoq-android", | |
| 17 | + "platforms": { | |
| 18 | + "linux-x86_64": { | |
| 19 | + "size": 14150473, | |
| 20 | + "hash": "sha256", | |
| 21 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 22 | + "format": "tar.gz", | |
| 23 | + "path": "libjoltmoq.so", | |
| 24 | + "providers": [ | |
| 25 | + { | |
| 26 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 27 | + } | |
| 28 | + ] | |
| 29 | + }, | |
| 30 | + "linux-aarch64": { | |
| 31 | + "size": 14150473, | |
| 32 | + "hash": "sha256", | |
| 33 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 34 | + "format": "tar.gz", | |
| 35 | + "path": "libjoltmoq.so", | |
| 36 | + "providers": [ | |
| 37 | + { | |
| 38 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 39 | + } | |
| 40 | + ] | |
| 41 | + }, | |
| 42 | + "macos-x86_64": { | |
| 43 | + "size": 14150473, | |
| 44 | + "hash": "sha256", | |
| 45 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 46 | + "format": "tar.gz", | |
| 47 | + "path": "libjoltmoq.so", | |
| 48 | + "providers": [ | |
| 49 | + { | |
| 50 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 51 | + } | |
| 52 | + ] | |
| 53 | + }, | |
| 54 | + "macos-aarch64": { | |
| 55 | + "size": 14150473, | |
| 56 | + "hash": "sha256", | |
| 57 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 58 | + "format": "tar.gz", | |
| 59 | + "path": "libjoltmoq.so", | |
| 60 | + "providers": [ | |
| 61 | + { | |
| 62 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 63 | + } | |
| 64 | + ] | |
| 65 | + } | |
| 66 | + } | |
| 67 | +} | |
| new file mode 100755 | |||
| @@ -0,0 +1,67 @@ | |||
| 1 | +#!/usr/bin/env dotslash | ||
| 2 | + | ||
| 3 | +// The AV media plane for the phone, from jolt-native's v0.1.3 release. | ||
| 4 | +// | ||
| 5 | +// The same tarball libvidya-android names, and deliberately so: the two objects | ||
| 6 | +// are built together and only make sense together — libjoltapp links both, and | ||
| 7 | +// a libjoltmoq from one release beside a libvidya from another is a pairing | ||
| 8 | +// nothing has tested. Same digest, different file out of it. | ||
| 9 | +// | ||
| 10 | +// Before v0.1.3 there was no such object at all: the media plane was V4L2 and | ||
| 11 | +// PipeWire, which a phone has neither of. The camera is Camera2 over JNI now | ||
| 12 | +// and the microphone is cpal's AAudio host. | ||
| 13 | +// | ||
| 14 | +// A sibling jolt-native checkout still wins over this, the same as libvidya. | ||
| 15 | +{ | ||
| 16 | + "name": "libjoltmoq-android", | ||
| 17 | + "platforms": { | ||
| 18 | + "linux-x86_64": { | ||
| 19 | + "size": 14150473, | ||
| 20 | + "hash": "sha256", | ||
| 21 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 22 | + "format": "tar.gz", | ||
| 23 | + "path": "libjoltmoq.so", | ||
| 24 | + "providers": [ | ||
| 25 | + { | ||
| 26 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | ||
| 27 | + } | ||
| 28 | + ] | ||
| 29 | + }, | ||
| 30 | + "linux-aarch64": { | ||
| 31 | + "size": 14150473, | ||
| 32 | + "hash": "sha256", | ||
| 33 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 34 | + "format": "tar.gz", | ||
| 35 | + "path": "libjoltmoq.so", | ||
| 36 | + "providers": [ | ||
| 37 | + { | ||
| 38 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | ||
| 39 | + } | ||
| 40 | + ] | ||
| 41 | + }, | ||
| 42 | + "macos-x86_64": { | ||
| 43 | + "size": 14150473, | ||
| 44 | + "hash": "sha256", | ||
| 45 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 46 | + "format": "tar.gz", | ||
| 47 | + "path": "libjoltmoq.so", | ||
| 48 | + "providers": [ | ||
| 49 | + { | ||
| 50 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | ||
| 51 | + } | ||
| 52 | + ] | ||
| 53 | + }, | ||
| 54 | + "macos-aarch64": { | ||
| 55 | + "size": 14150473, | ||
| 56 | + "hash": "sha256", | ||
| 57 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 58 | + "format": "tar.gz", | ||
| 59 | + "path": "libjoltmoq.so", | ||
| 60 | + "providers": [ | ||
| 61 | + { | ||
| 62 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | ||
| 63 | + } | ||
| 64 | + ] | ||
| 65 | + } | ||
| 66 | + } | ||
| 67 | +} | ||
modified
scripts/libvidya-android.dotslash +13 -13 | @@ -1,6 +1,6 @@ | ||
| 1 | 1 | #!/usr/bin/env dotslash |
| 2 | 2 | |
| 3 | -// libvidya for the phone, from jolt-native's v0.1.2 release. | |
| 3 | +// libvidya for the phone, from jolt-native's v0.1.3 release. | |
| 4 | 4 | // |
| 5 | 5 | // arm64, API 28, built by NDK r29 through jolt-native's buck2 toolchain. The |
| 6 | 6 | // same object `just ffi-android` produces there, pinned so that building the |
| @@ -13,50 +13,50 @@ | ||
| 13 | 13 | "name": "libvidya-android", |
| 14 | 14 | "platforms": { |
| 15 | 15 | "linux-x86_64": { |
| 16 | - "size": 5469258, | |
| 16 | + "size": 14150473, | |
| 17 | 17 | "hash": "sha256", |
| 18 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 18 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 19 | 19 | "format": "tar.gz", |
| 20 | 20 | "path": "libvidya.so", |
| 21 | 21 | "providers": [ |
| 22 | 22 | { |
| 23 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | |
| 23 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 24 | 24 | } |
| 25 | 25 | ] |
| 26 | 26 | }, |
| 27 | 27 | "linux-aarch64": { |
| 28 | - "size": 5469258, | |
| 28 | + "size": 14150473, | |
| 29 | 29 | "hash": "sha256", |
| 30 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 30 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 31 | 31 | "format": "tar.gz", |
| 32 | 32 | "path": "libvidya.so", |
| 33 | 33 | "providers": [ |
| 34 | 34 | { |
| 35 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | |
| 35 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 36 | 36 | } |
| 37 | 37 | ] |
| 38 | 38 | }, |
| 39 | 39 | "macos-x86_64": { |
| 40 | - "size": 5469258, | |
| 40 | + "size": 14150473, | |
| 41 | 41 | "hash": "sha256", |
| 42 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 42 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 43 | 43 | "format": "tar.gz", |
| 44 | 44 | "path": "libvidya.so", |
| 45 | 45 | "providers": [ |
| 46 | 46 | { |
| 47 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | |
| 47 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 48 | 48 | } |
| 49 | 49 | ] |
| 50 | 50 | }, |
| 51 | 51 | "macos-aarch64": { |
| 52 | - "size": 5469258, | |
| 52 | + "size": 14150473, | |
| 53 | 53 | "hash": "sha256", |
| 54 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 54 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 55 | 55 | "format": "tar.gz", |
| 56 | 56 | "path": "libvidya.so", |
| 57 | 57 | "providers": [ |
| 58 | 58 | { |
| 59 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | |
| 59 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" | |
| 60 | 60 | } |
| 61 | 61 | ] |
| 62 | 62 | } |
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/usr/bin/env dotslash | 1 | #!/usr/bin/env dotslash |
| 2 | 2 | ||
| 3 | -// libvidya for the phone, from jolt-native's v0.1.2 release. | 3 | +// libvidya for the phone, from jolt-native's v0.1.3 release. |
| 4 | // | 4 | // |
| 5 | // arm64, API 28, built by NDK r29 through jolt-native's buck2 toolchain. The | 5 | // arm64, API 28, built by NDK r29 through jolt-native's buck2 toolchain. The |
| 6 | // same object `just ffi-android` produces there, pinned so that building the | 6 | // same object `just ffi-android` produces there, pinned so that building the |
| @@ -13,50 +13,50 @@ | |||
| 13 | "name": "libvidya-android", | 13 | "name": "libvidya-android", |
| 14 | "platforms": { | 14 | "platforms": { |
| 15 | "linux-x86_64": { | 15 | "linux-x86_64": { |
| 16 | - "size": 5469258, | 16 | + "size": 14150473, |
| 17 | "hash": "sha256", | 17 | "hash": "sha256", |
| 18 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 18 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 19 | "format": "tar.gz", | 19 | "format": "tar.gz", |
| 20 | "path": "libvidya.so", | 20 | "path": "libvidya.so", |
| 21 | "providers": [ | 21 | "providers": [ |
| 22 | { | 22 | { |
| 23 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | 23 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" |
| 24 | } | 24 | } |
| 25 | ] | 25 | ] |
| 26 | }, | 26 | }, |
| 27 | "linux-aarch64": { | 27 | "linux-aarch64": { |
| 28 | - "size": 5469258, | 28 | + "size": 14150473, |
| 29 | "hash": "sha256", | 29 | "hash": "sha256", |
| 30 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 30 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 31 | "format": "tar.gz", | 31 | "format": "tar.gz", |
| 32 | "path": "libvidya.so", | 32 | "path": "libvidya.so", |
| 33 | "providers": [ | 33 | "providers": [ |
| 34 | { | 34 | { |
| 35 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | 35 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" |
| 36 | } | 36 | } |
| 37 | ] | 37 | ] |
| 38 | }, | 38 | }, |
| 39 | "macos-x86_64": { | 39 | "macos-x86_64": { |
| 40 | - "size": 5469258, | 40 | + "size": 14150473, |
| 41 | "hash": "sha256", | 41 | "hash": "sha256", |
| 42 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 42 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 43 | "format": "tar.gz", | 43 | "format": "tar.gz", |
| 44 | "path": "libvidya.so", | 44 | "path": "libvidya.so", |
| 45 | "providers": [ | 45 | "providers": [ |
| 46 | { | 46 | { |
| 47 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | 47 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" |
| 48 | } | 48 | } |
| 49 | ] | 49 | ] |
| 50 | }, | 50 | }, |
| 51 | "macos-aarch64": { | 51 | "macos-aarch64": { |
| 52 | - "size": 5469258, | 52 | + "size": 14150473, |
| 53 | "hash": "sha256", | 53 | "hash": "sha256", |
| 54 | - "digest": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 54 | + "digest": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 55 | "format": "tar.gz", | 55 | "format": "tar.gz", |
| 56 | "path": "libvidya.so", | 56 | "path": "libvidya.so", |
| 57 | "providers": [ | 57 | "providers": [ |
| 58 | { | 58 | { |
| 59 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz" | 59 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz" |
| 60 | } | 60 | } |
| 61 | ] | 61 | ] |
| 62 | } | 62 | } |
modified
toolchains/dist/BUCK +4 -2 | @@ -4,10 +4,12 @@ load("//:dist.bzl", "dist_archive", "dotslash_dist") | ||
| 4 | 4 | |
| 5 | 5 | dotslash_dist(name = "dotslash", platform = "linux-x86_64") |
| 6 | 6 | |
| 7 | -# jolt-native's release. Both are what a build gets when there is no sibling | |
| 8 | -# checkout to prefer — see the `buck` recipe in the justfile. | |
| 7 | +# jolt-native's release: what a build gets when there is no sibling checkout to | |
| 8 | +# prefer — see the `buck` recipe in the justfile. | |
| 9 | 9 | dist_archive(name = "libvidya-android", tool = "libvidya-android", platform = "linux-x86_64") |
| 10 | 10 | |
| 11 | +dist_archive(name = "libjoltmoq-android", tool = "libjoltmoq-android", platform = "linux-x86_64") | |
| 12 | + | |
| 11 | 13 | dist_archive(name = "glimmer-vidya", tool = "glimmer-vidya", platform = "linux-x86_64") |
| 12 | 14 | |
| 13 | 15 | dist_archive(name = "android-glue", tool = "android-glue", platform = "linux-x86_64") |
| @@ -4,10 +4,12 @@ load("//:dist.bzl", "dist_archive", "dotslash_dist") | |||
| 4 | 4 | ||
| 5 | dotslash_dist(name = "dotslash", platform = "linux-x86_64") | 5 | dotslash_dist(name = "dotslash", platform = "linux-x86_64") |
| 6 | 6 | ||
| 7 | -# jolt-native's release. Both are what a build gets when there is no sibling | 7 | +# jolt-native's release: what a build gets when there is no sibling checkout to |
| 8 | -# checkout to prefer — see the `buck` recipe in the justfile. | 8 | +# prefer — see the `buck` recipe in the justfile. |
| 9 | dist_archive(name = "libvidya-android", tool = "libvidya-android", platform = "linux-x86_64") | 9 | dist_archive(name = "libvidya-android", tool = "libvidya-android", platform = "linux-x86_64") |
| 10 | 10 | ||
| 11 | +dist_archive(name = "libjoltmoq-android", tool = "libjoltmoq-android", platform = "linux-x86_64") | ||
| 12 | + | ||
| 11 | dist_archive(name = "glimmer-vidya", tool = "glimmer-vidya", platform = "linux-x86_64") | 13 | dist_archive(name = "glimmer-vidya", tool = "glimmer-vidya", platform = "linux-x86_64") |
| 12 | 14 | ||
| 13 | dist_archive(name = "android-glue", tool = "android-glue", platform = "linux-x86_64") | 15 | dist_archive(name = "android-glue", tool = "android-glue", platform = "linux-x86_64") |
modified
toolchains/dist/generated.bzl +42 -16 | @@ -6,26 +6,26 @@ | ||
| 6 | 6 | DIST = { |
| 7 | 7 | "android-glue": { |
| 8 | 8 | "linux-aarch64": { |
| 9 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | |
| 10 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 9 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", | |
| 10 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 11 | 11 | "strip_prefix": "jolt-native-android-glue", |
| 12 | 12 | "type": "tar.gz" |
| 13 | 13 | }, |
| 14 | 14 | "linux-x86_64": { |
| 15 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | |
| 16 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 15 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", | |
| 16 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 17 | 17 | "strip_prefix": "jolt-native-android-glue", |
| 18 | 18 | "type": "tar.gz" |
| 19 | 19 | }, |
| 20 | 20 | "macos-aarch64": { |
| 21 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | |
| 22 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 21 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", | |
| 22 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 23 | 23 | "strip_prefix": "jolt-native-android-glue", |
| 24 | 24 | "type": "tar.gz" |
| 25 | 25 | }, |
| 26 | 26 | "macos-x86_64": { |
| 27 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | |
| 28 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | |
| 27 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", | |
| 28 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", | |
| 29 | 29 | "strip_prefix": "jolt-native-android-glue", |
| 30 | 30 | "type": "tar.gz" |
| 31 | 31 | } |
| @@ -82,28 +82,54 @@ DIST = { | ||
| 82 | 82 | "type": "tar.gz" |
| 83 | 83 | } |
| 84 | 84 | }, |
| 85 | + "libjoltmoq-android": { | |
| 86 | + "linux-aarch64": { | |
| 87 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 88 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 89 | + "strip_prefix": "", | |
| 90 | + "type": "tar.gz" | |
| 91 | + }, | |
| 92 | + "linux-x86_64": { | |
| 93 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 94 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 95 | + "strip_prefix": "", | |
| 96 | + "type": "tar.gz" | |
| 97 | + }, | |
| 98 | + "macos-aarch64": { | |
| 99 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 100 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 101 | + "strip_prefix": "", | |
| 102 | + "type": "tar.gz" | |
| 103 | + }, | |
| 104 | + "macos-x86_64": { | |
| 105 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 106 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 107 | + "strip_prefix": "", | |
| 108 | + "type": "tar.gz" | |
| 109 | + } | |
| 110 | + }, | |
| 85 | 111 | "libvidya-android": { |
| 86 | 112 | "linux-aarch64": { |
| 87 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | |
| 88 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 113 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 114 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 89 | 115 | "strip_prefix": "", |
| 90 | 116 | "type": "tar.gz" |
| 91 | 117 | }, |
| 92 | 118 | "linux-x86_64": { |
| 93 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | |
| 94 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 119 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 120 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 95 | 121 | "strip_prefix": "", |
| 96 | 122 | "type": "tar.gz" |
| 97 | 123 | }, |
| 98 | 124 | "macos-aarch64": { |
| 99 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | |
| 100 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 125 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 126 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 101 | 127 | "strip_prefix": "", |
| 102 | 128 | "type": "tar.gz" |
| 103 | 129 | }, |
| 104 | 130 | "macos-x86_64": { |
| 105 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | |
| 106 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | |
| 131 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | |
| 132 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | |
| 107 | 133 | "strip_prefix": "", |
| 108 | 134 | "type": "tar.gz" |
| 109 | 135 | } |
| @@ -6,26 +6,26 @@ | |||
| 6 | DIST = { | 6 | DIST = { |
| 7 | "android-glue": { | 7 | "android-glue": { |
| 8 | "linux-aarch64": { | 8 | "linux-aarch64": { |
| 9 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | 9 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", |
| 10 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 10 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 11 | "strip_prefix": "jolt-native-android-glue", | 11 | "strip_prefix": "jolt-native-android-glue", |
| 12 | "type": "tar.gz" | 12 | "type": "tar.gz" |
| 13 | }, | 13 | }, |
| 14 | "linux-x86_64": { | 14 | "linux-x86_64": { |
| 15 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | 15 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", |
| 16 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 16 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 17 | "strip_prefix": "jolt-native-android-glue", | 17 | "strip_prefix": "jolt-native-android-glue", |
| 18 | "type": "tar.gz" | 18 | "type": "tar.gz" |
| 19 | }, | 19 | }, |
| 20 | "macos-aarch64": { | 20 | "macos-aarch64": { |
| 21 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | 21 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", |
| 22 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 22 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 23 | "strip_prefix": "jolt-native-android-glue", | 23 | "strip_prefix": "jolt-native-android-glue", |
| 24 | "type": "tar.gz" | 24 | "type": "tar.gz" |
| 25 | }, | 25 | }, |
| 26 | "macos-x86_64": { | 26 | "macos-x86_64": { |
| 27 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-glue-v0.1.2.tar.gz", | 27 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-glue-v0.1.3.tar.gz", |
| 28 | - "sha256": "4b46a31d119ad2a5c4c9125f3e146dc67d49b571afc60298d8755cd38f06de62", | 28 | + "sha256": "83313eda124f2a0cfff6827cf4473600c1f71db2f208d654b97068a85af38da5", |
| 29 | "strip_prefix": "jolt-native-android-glue", | 29 | "strip_prefix": "jolt-native-android-glue", |
| 30 | "type": "tar.gz" | 30 | "type": "tar.gz" |
| 31 | } | 31 | } |
| @@ -82,28 +82,54 @@ DIST = { | |||
| 82 | "type": "tar.gz" | 82 | "type": "tar.gz" |
| 83 | } | 83 | } |
| 84 | }, | 84 | }, |
| 85 | + "libjoltmoq-android": { | ||
| 86 | + "linux-aarch64": { | ||
| 87 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | ||
| 88 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 89 | + "strip_prefix": "", | ||
| 90 | + "type": "tar.gz" | ||
| 91 | + }, | ||
| 92 | + "linux-x86_64": { | ||
| 93 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | ||
| 94 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 95 | + "strip_prefix": "", | ||
| 96 | + "type": "tar.gz" | ||
| 97 | + }, | ||
| 98 | + "macos-aarch64": { | ||
| 99 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | ||
| 100 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 101 | + "strip_prefix": "", | ||
| 102 | + "type": "tar.gz" | ||
| 103 | + }, | ||
| 104 | + "macos-x86_64": { | ||
| 105 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", | ||
| 106 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", | ||
| 107 | + "strip_prefix": "", | ||
| 108 | + "type": "tar.gz" | ||
| 109 | + } | ||
| 110 | + }, | ||
| 85 | "libvidya-android": { | 111 | "libvidya-android": { |
| 86 | "linux-aarch64": { | 112 | "linux-aarch64": { |
| 87 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | 113 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", |
| 88 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 114 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 89 | "strip_prefix": "", | 115 | "strip_prefix": "", |
| 90 | "type": "tar.gz" | 116 | "type": "tar.gz" |
| 91 | }, | 117 | }, |
| 92 | "linux-x86_64": { | 118 | "linux-x86_64": { |
| 93 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | 119 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", |
| 94 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 120 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 95 | "strip_prefix": "", | 121 | "strip_prefix": "", |
| 96 | "type": "tar.gz" | 122 | "type": "tar.gz" |
| 97 | }, | 123 | }, |
| 98 | "macos-aarch64": { | 124 | "macos-aarch64": { |
| 99 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | 125 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", |
| 100 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 126 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 101 | "strip_prefix": "", | 127 | "strip_prefix": "", |
| 102 | "type": "tar.gz" | 128 | "type": "tar.gz" |
| 103 | }, | 129 | }, |
| 104 | "macos-x86_64": { | 130 | "macos-x86_64": { |
| 105 | - "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.2/downloads/jolt-native-android-arm64-v0.1.2.tar.gz", | 131 | + "url": "https://gitlab.com/nandithebull/jolt-native/-/releases/v0.1.3/downloads/jolt-native-android-arm64-v0.1.3.tar.gz", |
| 106 | - "sha256": "fd57b1681b4e720f578faeacd1b2abd862ba3fe8929b8fb8f3110d74b6b6eb9d", | 132 | + "sha256": "4519745bae6db9a791a71b38a26478879e246166802b0a48dbf7d45e4d45a108", |
| 107 | "strip_prefix": "", | 133 | "strip_prefix": "", |
| 108 | "type": "tar.gz" | 134 | "type": "tar.gz" |
| 109 | } | 135 | } |