Merge branch 'j-hc:main' into main

NBruderman · Mar 31, 2024 · 1a85cd5 · 1a85cd5
2 parents abffdcc + e47771c
commit 1a85cd5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/htmlq/htmlq-arm b/bin/htmlq/htmlq-arm
diff --git a/bin/htmlq/htmlq-arm64 b/bin/htmlq/htmlq-arm64
diff --git a/utils.sh b/utils.sh
@@ -92,10 +92,10 @@ get_prebuilts() {
 	if [ "$OS" = Android ]; then
 		local arch
 		if [ "$(uname -m)" = aarch64 ]; then arch=arm64; else arch=arm; fi
-		HTMLQ="${BIN_DIR}/htmlq-${arch}"
-		AAPT2="${BIN_DIR}/aapt2-${arch}"
+		HTMLQ="${BIN_DIR}/htmlq/htmlq-${arch}"
+		AAPT2="${BIN_DIR}/aapt2/aapt2-${arch}"
 	else
-		HTMLQ="${BIN_DIR}/htmlq-x86_64"
+		HTMLQ="${BIN_DIR}/htmlq/htmlq-x86_64"
 	fi
 	mkdir -p ${MODULE_TEMPLATE_DIR}/bin/arm64 ${MODULE_TEMPLATE_DIR}/bin/arm ${MODULE_TEMPLATE_DIR}/bin/x86 ${MODULE_TEMPLATE_DIR}/bin/x64
 	dl_if_dne "${MODULE_TEMPLATE_DIR}/bin/arm64/cmpr" "https://github.com/j-hc/cmpr/releases/latest/download/cmpr-arm64-v8a"