Merge changes from topic "elfutils-zstd" into main am: 7c7f2af329

Original change: https://android-review.googlesource.com/c/platform/external/elfutils/+/2826411

Change-Id: Ic1bbe69f9ba29fae301ada21313f7a578a29569a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 9146e4a3..848df077 100644
--- a/Android.bp
+++ b/Android.bp
@@ -46,6 +46,7 @@ cc_defaults {
     name: "elfutils_transitive_defaults",
     static_libs: [
         "libz",
+        "libzstd",
     ],
 }
 
@@ -169,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