From d2c01ed83f67f4453bcd8114167ee5a388071346 Mon Sep 17 00:00:00 2001 From: DroidFreak32 Date: Sat, 6 May 2023 11:09:08 +0530 Subject: [PATCH 1/3] zstd: Allow to build zstd cmdline tools Test: mka zstd Change-Id: Ic5f3e9bf2ff7e9188c1974d1b0ec81204e9cbd91 --- Android.bp | 55 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/Android.bp b/Android.bp index 85d972884..638b73922 100644 --- a/Android.bp +++ b/Android.bp @@ -109,15 +109,56 @@ cc_library { export_include_dirs: ["lib"], } -cc_binary_host { +cc_binary { name: "zstd", defaults: ["zstd_defaults"], - srcs: [ - "programs/*.c", - // Rebuild the whole library as part of the binary to enable multithreading. - "lib/*/*.c", - ], - cflags: ["-DZSTD_MULTITHREAD=1"], + system_ext_specific: true, + host_supported: true, + target: { + android: { + srcs: ["programs/*.c"], + cflags: [ + "-DZSTD_GZCOMPRESS", + "-DZSTD_GZDECOMPRESS", + "-DZSTD_LZ4COMPRESS", + "-DZSTD_LZ4DECOMPRESS", + "-DZSTD_MULTITHREAD", + "-Wall", + "-Werror", + ], + shared_libs: [ + "liblz4", + "libz", + "libzstd", + ], + required: ["zstdgrep", "zstdless"], + symlinks: [ + "zstdcat", + "zstdmt", + "unzstd", + ], + }, + host: { + srcs: [ + "programs/*.c", + // Rebuild the whole library as part of the binary to enable multithreading. + "lib/*/*.c", + ], + cflags: ["-DZSTD_MULTITHREAD=1"], + }, + }, +} + +sh_binary { + name: "zstdgrep", + src: "programs/zstdgrep", + system_ext_specific: true, +} + +sh_binary { + name: "zstdless", + src: "programs/zstdless", + system_ext_specific: true, } cc_defaults { From add20f9beaa0a1aa013a277f6643f61f084250bb Mon Sep 17 00:00:00 2001 From: DroidFreak32 Date: Sun, 18 Dec 2022 18:49:57 +0530 Subject: [PATCH 2/3] zstd: Android.bp: Allow rsync to add zstd compression support Change-Id: Ic92ad997f9b8dd4686df1e1fa5d0dfb88fdab345 --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index 638b73922..51f5d112f 100644 --- a/Android.bp +++ b/Android.bp @@ -77,6 +77,7 @@ cc_library { "//external/elfutils:__subpackages__", "//external/libbpf:__subpackages__", "//external/mesa3d:__subpackages__", + "//external/rsync:__subpackages__", "//external/squashfs-tools/squashfs-tools:__subpackages__", "//external/stg:__subpackages__", "//frameworks/libs/binary_translation/tools:__subpackages__", From 9826aa3b25fd3d6f186d181b37ca6f14c3fc22fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 14:37:34 +0000 Subject: [PATCH 3/3] Bump android-actions/setup-android from 3.2.2 to 4.0.1 Bumps [android-actions/setup-android](https://github.com/android-actions/setup-android) from 3.2.2 to 4.0.1. - [Release notes](https://github.com/android-actions/setup-android/releases) - [Commits](https://github.com/android-actions/setup-android/compare/9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407...40fd30fb8d7440372e1316f5d1809ec01dcd3699) --- updated-dependencies: - dependency-name: android-actions/setup-android dependency-version: 4.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/android-ndk-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android-ndk-build.yml b/.github/workflows/android-ndk-build.yml index 175add4ff..58ca63fb2 100644 --- a/.github/workflows/android-ndk-build.yml +++ b/.github/workflows/android-ndk-build.yml @@ -22,7 +22,7 @@ jobs: distribution: 'temurin' - name: Setup Android SDK - uses: android-actions/setup-android@9fc6c4e9069bf8d3d10b2204b1fb8f6ef7065407 # v3.2.2 + uses: android-actions/setup-android@40fd30fb8d7440372e1316f5d1809ec01dcd3699 # v4.0.1 - name: Install Android NDK run: |