Merge changes from topic "elfutils-zstd" into mainandroid-u-rb-dp-10-gplandroid-u-rb-dp-10-gpl

* changes:
  libdwfl: enable ZSTD compressed debug info support
  elfutils: refactor transitive dependencies

3 files changed, 15 insertions, 7 deletions

diff --git a/Android.bp b/Android.bp
index 1563dcd1..848df077 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,8 +39,20 @@ license {
     ],
 }
 
+// Properties to apply to all static libraries that use elfutils.
+// Soong doesn't have propagation for static library dependencies,
+// and this have to be included explicitly by elfutils users.
+cc_defaults {
+    name: "elfutils_transitive_defaults",
+    static_libs: [
+        "libz",
+        "libzstd",
+    ],
+}
+
 cc_defaults {
     name: "elfutils_defaults",
+    defaults: ["elfutils_transitive_defaults"],
     cflags: [
         "-DHAVE_CONFIG_H",
         "-D_GNU_SOURCE",
@@ -75,8 +87,6 @@ cc_library {
 
     srcs:  ["libelf/*.c",],
 
-    static_libs: ["libz"],
-
     export_include_dirs: ["libelf"],
 
     target: {
@@ -139,7 +149,6 @@ cc_library_host_static {
         musl: {
             static_libs: [
                 "libfts",
-                "libz",
             ],
         },
     },
@@ -161,7 +170,6 @@ cc_library_host_static {
         // Do not enabled compression support
         "libdwfl/bzip2.c",
         "libdwfl/lzma.c",
-        "libdwfl/zstd.c",
         // Those headers are incompatible with clang due to nested function
         // definitions.
         "libdwfl/dwfl_segment_report_module.c",
diff --git a/config.h b/config.h
index 873627e0..fb46250a 100644
--- a/config.h
+++ b/config.h
@@ -189,10 +189,10 @@
 #define USE_ZLIB 1
 
 /* Support ZSTD (zst) decompression via -lzstd. */
-/* #undef USE_ZSTD */
+#define USE_ZSTD 1
 
 /* zstd compression support */
-/* #undef USE_ZSTD_COMPRESS */
+#define USE_ZSTD_COMPRESS 1
 
 /* Version number of package */
 #define VERSION "0.189"
diff --git a/post_update.sh b/post_update.sh
index 7072c8f4..9079e374 100755
--- a/post_update.sh
+++ b/post_update.sh
@@ -11,7 +11,7 @@ if [ "$1" != "" ]; then
     cd $1
 fi
 
-autoreconf -i && ./configure --enable-maintainer-mode --disable-debuginfod --disable-libdebuginfod --without-lzma --without-bzlib --without-zstd
+autoreconf -i && ./configure --enable-maintainer-mode --disable-debuginfod --disable-libdebuginfod --without-lzma --without-bzlib
 
 # if called from the external_updater, do not apply any patches as it will do
 # that for us