Revert "Link lzma and lz4 compression libs statically into libartbase and use that"

This reverts commit 21579bec04bea8a9a6ca65ad5493016d1fcb9dcc.

Reason for revert: Build failure

Change-Id: Ia941425b9462f478be78058b3d63a30106421de6

2 files changed, 0 insertions, 25 deletions

diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 1e776ae812..5010f683d7 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -71,16 +71,6 @@ cc_defaults {
         // For common macros.
         "libbase",
     ],
-
-    // Utilities used by various ART libs and tools are linked in statically
-    // here to avoid shared lib dependencies outside the ART APEX. No target
-    // there should depend on these separately.
-    whole_static_libs: [
-        "liblz4",
-        "liblzma",
-    ],
-    version_script: "libartbase.map",
-
     export_include_dirs: ["."],
     // ART's macros.h depends on libbase's macros.h.
     // Note: runtime_options.h depends on cmdline. But we don't really want to export this
diff --git a/libartbase/libartbase.map b/libartbase/libartbase.map
deleted file mode 100644
index 6249930dc1..0000000000
--- a/libartbase/libartbase.map
+++ /dev/null
@@ -1,15 +0,0 @@
-# This is used only to hide data symbols that get imported through
-# whole_static_libs, or else they might trigger the ASan odr-violation check.
-# Before adding symbols here, please make sure that it doesn't give rise to a
-# real ODR problem. All these symbols are either in .rodata or .data.rel.ro
-# sections.
-LIBARTBASE {
-  local:
-    PPMD7_kExpEscape;
-    XZ_SIG;
-    g_AlignedAlloc;
-    g_Alloc;
-    g_BigAlloc;
-    g_MidAlloc;
-    k7zSignature;
-};