From 2ad45d5a5b701e00133e7eb393be0f6c78b3893d Mon Sep 17 00:00:00 2001 From: Kyant0 Date: Fri, 20 Dec 2024 21:00:45 +0800 Subject: [PATCH] Merge 2024 Q4 --- README.md | 18 ------------------ fishnet/src/main/cpp/external/art | 2 +- fishnet/src/main/cpp/external/libbase | 2 +- fishnet/src/main/cpp/external/libprocinfo | 2 +- fishnet/src/main/cpp/external/logging | 2 +- fishnet/src/main/cpp/external/lzma | 2 +- fishnet/src/main/cpp/external/unwinding | 2 +- fishnet/src/main/cpp/external/zstd | 2 +- gradle/libs.versions.toml | 2 +- 9 files changed, 8 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 5b7c86e..72d8c6d 100644 --- a/README.md +++ b/README.md @@ -59,21 +59,3 @@ git submodule update git apply fishnet_external.patch ``` - -## Submodule maintain info - -| Repository | Link | Update time | -|----------------------|-----------------------------------------------------------------------------------------------------------------------------------|----------------------------| -| art | [art](https://android.googlesource.com/platform/art/+/54cd7bf45839805d7f0f2708a6c9a65c70ca154a) | 2024 Nov 25 21:04:05 | -| | [libartbase](https://android.googlesource.com/platform/art/+log/refs/heads/main/libartbase) | 2024 Nov 22 16:37:17 | -| | [libartpalette](https://android.googlesource.com/platform/art/+log/refs/heads/main/libartpalette) | 2024 Aug 29 12:15:41 | -| | [libdexfile](https://android.googlesource.com/platform/art/+log/refs/heads/main/libdexfile) | 2024 Nov 18 10:53:22 | -| system/libbase | [system/libbase](https://android.googlesource.com/platform/system/libbase/+/72bf9612eacb940beaefbabc116c9f5b293d5ad1) | 2024 Nov 07 20:40:11 | -| system/libprocinfo | [system/libprocinfo](https://android.googlesource.com/platform/system/libprocinfo/+/b6b71fd97d7015a59175936a9b3824623470a1a7) | 2024 Aug 14 22:08:40 | -| system/libziparchive | [system/libziparchive](https://android.googlesource.com/platform/system/libziparchive/+/63f00d1ade29315dc0adac08fceae9984305205d) | 2024 Jun 04 23:06:47 | -| system/logging | [system/logging](https://android.googlesource.com/platform/system/logging/+/b34720941c1a18249615ebed5a25d05ff12bfad1) | 2024 Sep 16 16:54:16 | -| | [liblog](https://android.googlesource.com/platform/system/logging/+log/refs/heads/main/liblog) | 2024 Sep 11 14:28:59 | -| system/unwinding | [system/unwinding](https://android.googlesource.com/platform/system/unwinding/+/c7b83a52e8dbe29735e74f0abee1fe565a7ced5b) | 2024 Sep 12 14:09:02 -0700 | -| | [libunwindstack](https://android.googlesource.com/platform/system/unwinding/+log/refs/heads/main/libunwindstack) | 2024 Sep 12 14:09:02 -0700 | -| external/lzma | [external/lzma](https://android.googlesource.com/platform/external/lzma/+/1c87526f4839d9276d0dfdcaceea8a6c8dcd100d) | 2024 Sep 09 13:20:46 | -| external/zstd | [external/zstd](https://android.googlesource.com/platform/external/zstd/+/d06a29da1edcc46177e774010cc2ef6158366b52) | 2024 Jul 11 02:24:39 | diff --git a/fishnet/src/main/cpp/external/art b/fishnet/src/main/cpp/external/art index 54cd7bf..920b937 160000 --- a/fishnet/src/main/cpp/external/art +++ b/fishnet/src/main/cpp/external/art @@ -1 +1 @@ -Subproject commit 54cd7bf45839805d7f0f2708a6c9a65c70ca154a +Subproject commit 920b937cd80840dc68c526df6151592ada436c70 diff --git a/fishnet/src/main/cpp/external/libbase b/fishnet/src/main/cpp/external/libbase index 72bf961..b53532a 160000 --- a/fishnet/src/main/cpp/external/libbase +++ b/fishnet/src/main/cpp/external/libbase @@ -1 +1 @@ -Subproject commit 72bf9612eacb940beaefbabc116c9f5b293d5ad1 +Subproject commit b53532a9c1ee644e2e95e6c631dd9088bf05c56c diff --git a/fishnet/src/main/cpp/external/libprocinfo b/fishnet/src/main/cpp/external/libprocinfo index b6b71fd..e7c5e80 160000 --- a/fishnet/src/main/cpp/external/libprocinfo +++ b/fishnet/src/main/cpp/external/libprocinfo @@ -1 +1 @@ -Subproject commit b6b71fd97d7015a59175936a9b3824623470a1a7 +Subproject commit e7c5e80fc9b28c04f5db9de8d2855377d05126c5 diff --git a/fishnet/src/main/cpp/external/logging b/fishnet/src/main/cpp/external/logging index b347209..e41177e 160000 --- a/fishnet/src/main/cpp/external/logging +++ b/fishnet/src/main/cpp/external/logging @@ -1 +1 @@ -Subproject commit b34720941c1a18249615ebed5a25d05ff12bfad1 +Subproject commit e41177e3a6cfe201cf60ced6c23d200ae714b915 diff --git a/fishnet/src/main/cpp/external/lzma b/fishnet/src/main/cpp/external/lzma index 1c87526..3c80942 160000 --- a/fishnet/src/main/cpp/external/lzma +++ b/fishnet/src/main/cpp/external/lzma @@ -1 +1 @@ -Subproject commit 1c87526f4839d9276d0dfdcaceea8a6c8dcd100d +Subproject commit 3c8094288a7dab39f465316d4b14f39e3a3ace4b diff --git a/fishnet/src/main/cpp/external/unwinding b/fishnet/src/main/cpp/external/unwinding index c7b83a5..7720b3c 160000 --- a/fishnet/src/main/cpp/external/unwinding +++ b/fishnet/src/main/cpp/external/unwinding @@ -1 +1 @@ -Subproject commit c7b83a52e8dbe29735e74f0abee1fe565a7ced5b +Subproject commit 7720b3ca2c598173d505ffbbbc5cf390e9c08918 diff --git a/fishnet/src/main/cpp/external/zstd b/fishnet/src/main/cpp/external/zstd index d06a29d..01826a4 160000 --- a/fishnet/src/main/cpp/external/zstd +++ b/fishnet/src/main/cpp/external/zstd @@ -1 +1 @@ -Subproject commit d06a29da1edcc46177e774010cc2ef6158366b52 +Subproject commit 01826a4963a0d8a59bc3812d29bdf0fb76416722 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 613b5a8..bbeb3b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ android-targetSdk = "35" android-buildToolsVersion = "35.0.0" android-ndkVersion = "28.0.12674087" android-versionCode = "1" -lib-version = "1.0.0-alpha05" +lib-version = "1.0.0-alpha06" agp = "8.9.0-alpha05" # https://androidstudio.googleblog.com kotlin = "2.1.0" # https://github.com/JetBrains/kotlin