From 9d57d4402c1bf1ff3468a989961fcec8de58c796 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 | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/Android.bp b/Android.bp index a8913ed9..319b5717 100644 --- a/Android.bp +++ b/Android.bp @@ -41,6 +41,49 @@ license { ], } +cc_binary { + name: "zstd", + + cflags: [ + "-DZSTD_GZCOMPRESS", + "-DZSTD_GZDECOMPRESS", + "-DZSTD_LZ4COMPRESS", + "-DZSTD_LZ4DECOMPRESS", + "-DZSTD_MULTITHREAD", + "-Wall", + "-Werror", + ], + + shared_libs: [ + "liblz4", + "libz", + "libzstd", + ], + + srcs: ["programs/*.c"], + system_ext_specific: true, + + required: ["zstdgrep", "zstdless"], + + symlinks: [ + "zstdcat", + "zstdmt", + "unzstd", + ], +} + +sh_binary { + name: "zstdgrep", + src: "programs/zstdgrep", + system_ext_specific: true, +} + +sh_binary { + name: "zstdless", + src: "programs/zstdless", + system_ext_specific: true, +} + cc_library { name: "libzstd", min_sdk_version: "apex_inherit", @@ -118,6 +161,7 @@ cc_defaults { "lib/dictBuilder", "tests/fuzz", ], + system_ext_specific: true, cflags: [ "-Wno-error", "-Wno-pointer-arith", From ad0e5e9ed22dac1d3591dafddd8e283c629a2032 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Android.bp b/Android.bp index 319b5717..fc144cb0 100644 --- a/Android.bp +++ b/Android.bp @@ -104,6 +104,7 @@ cc_library { "//external/dwarves:__subpackages__", "//external/elfutils:__subpackages__", "//external/libbpf:__subpackages__", + "//external/rsync:__subpackages__", "//external/squashfs-tools/squashfs-tools:__subpackages__", "//external/stg:__subpackages__", "//frameworks/libs/binary_translation/tools:__subpackages__", @@ -120,6 +121,7 @@ cc_library { product_available: true, recovery_available: true, vendor_available: true, + system_ext_specific: true, host_supported: true, native_bridge_supported: true, ramdisk_available: true, From 581c8f29888e31fc5470f98479a0a3a22b55ff89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 17:52:38 +0000 Subject: [PATCH 3/3] Bump msys2/setup-msys2 from 2.22.0 to 2.27.0 Bumps [msys2/setup-msys2](https://github.com/msys2/setup-msys2) from 2.22.0 to 2.27.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/v2.22.0...61f9e5e925871ba6c9e3e8da24ede83ea27fa91f) --- updated-dependencies: - dependency-name: msys2/setup-msys2 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 eb8f40a9..bf731dee 100644 --- a/.github/workflows/dev-long-tests.yml +++ b/.github/workflows/dev-long-tests.yml @@ -247,7 +247,7 @@ jobs: shell: msys2 {0} steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1 - - uses: msys2/setup-msys2@cc11e9188b693c2b100158c3322424c4cc1dadea # tag=v2.22.0 + - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # tag=v2.27.0 with: msystem: MINGW64 install: make diff --git a/.github/workflows/dev-short-tests.yml b/.github/workflows/dev-short-tests.yml index 5324b38d..b7bba8ae 100644 --- a/.github/workflows/dev-short-tests.yml +++ b/.github/workflows/dev-short-tests.yml @@ -455,7 +455,7 @@ jobs: shell: msys2 {0} steps: - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1 - - uses: msys2/setup-msys2@cc11e9188b693c2b100158c3322424c4cc1dadea # tag=v2.22.0 + - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # tag=v2.27.0 with: msystem: ${{ matrix.msystem }} install: make diffutils diff --git a/.github/workflows/windows-artifacts.yml b/.github/workflows/windows-artifacts.yml index 52bc90a4..b418cbc5 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@5beef6d11f48bba68b9eb503e3adc60b23c0cc36 # tag=v2 + - uses: msys2/setup-msys2@61f9e5e925871ba6c9e3e8da24ede83ea27fa91f # tag=v2 with: msystem: ${{ matrix.msystem }} install: make zlib git p7zip mingw-w64-${{matrix.env}}-gcc