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 c491827513cb29ba0dce43e974076d4fe26c90cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jun 2026 14:37:51 +0000 Subject: [PATCH 3/3] Bump msys2/setup-msys2 from 2.26.0 to 2.32.0 Bumps [msys2/setup-msys2](https://github.com/msys2/setup-msys2) from 2.26.0 to 2.32.0. - [Release notes](https://github.com/msys2/setup-msys2/releases) - [Changelog](https://github.com/msys2/setup-msys2/blob/main/CHANGELOG.md) - [Commits](https://github.com/msys2/setup-msys2/compare/d44ca8e88d8b43d56cf5670f91747359d5537f97...66cd2cce69caa17b53920067426061ca1de3a884) --- updated-dependencies: - dependency-name: msys2/setup-msys2 dependency-version: 2.32.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/dev-long-tests.yml | 2 +- .github/workflows/dev-short-tests.yml | 2 +- .github/workflows/windows-artifacts.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml index 899a57b75..943ff3817 100644 --- a/.github/workflows/dev-long-tests.yml +++ b/.github/workflows/dev-long-tests.yml @@ -263,7 +263,7 @@ jobs: shell: msys2 {0} steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1 - - uses: msys2/setup-msys2@d44ca8e88d8b43d56cf5670f91747359d5537f97 # tag=v2.26.0 + - uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # tag=v2.32.0 with: msystem: MINGW64 install: make diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml index 7df105532..a7c75407e 100644 --- a/.github/workflows/dev-short-tests.yml +++ b/.github/workflows/dev-short-tests.yml @@ -544,7 +544,7 @@ jobs: shell: msys2 {0} steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1 - - uses: msys2/setup-msys2@d44ca8e88d8b43d56cf5670f91747359d5537f97 # tag=v2.26.0 + - uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # tag=v2.32.0 with: msystem: ${{ matrix.msystem }} install: make diffutils diff --git a/.github/workflows/windows-artifacts.yml b/.github/workflows/windows-artifacts.yml index 35999476e..b651b710f 100644 --- a/.github/workflows/windows-artifacts.yml +++ b/.github/workflows/windows-artifacts.yml @@ -24,7 +24,7 @@ jobs: shell: msys2 {0} steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v3 - - uses: msys2/setup-msys2@d44ca8e88d8b43d56cf5670f91747359d5537f97 # tag=v2.26.0 + - uses: msys2/setup-msys2@66cd2cce69caa17b53920067426061ca1de3a884 # tag=v2.32.0 with: msystem: ${{ matrix.msystem }} install: make zlib git p7zip mingw-w64-${{matrix.env}}-gcc