exynos9610: Reintroduce libdemangle shim

* Use whole_static_libs instead of the previous method of copying the
  source into the tree.

Change-Id: I24b1b415ac838ce09ab6322cb2143b5f01f4b6ab

diff --git a/common.mk b/common.mk
index 33e0c6bf9e2048185f0093a8b6ca2df4f31a82d9..ff5ddcffa9b90b2b63ed178ae4f89961f9570a3e 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -407,7 +407,8 @@ PRODUCT_COPY_FILES += \
 # Shims
 PRODUCT_PACKAGES += \
     libaudioproxy_shim \
-    libmemset_shim
+    libmemset_shim \
+    libdemangle.vendor
 
 # Shipping API
 $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)

diff --git a/proprietary-files.txt b/proprietary-files.txt
index d7f3a6517277042f2dc871d582ef85e078d4d919..e5fb76f54ef91fa2a89a073f1ae08995ab7ce39b 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -31,10 +31,6 @@ vendor/lib64/libhifills.so
 vendor/lib64/libvdis.so
 vendor/lib64/libyuvrepro.so
 
-# Camera - Shims - Built in lineage-21, and prebuilt here.
-vendor/lib/libdemangle.so|d3fc0883a09a0debbf79ddd4bba922e79cb3d9ee
-vendor/lib64/libdemangle.so|ac9a52ac9146d0eceaeaba5e0c47f0d2c14e4428
-
 ## Charger
 vendor/bin/charge_only_mode
 

diff --git a/shims/libdemangle/Android.bp b/shims/libdemangle/Android.bp
new file mode 100644 (file)
index 0000000..e0acc2a
--- /dev/null
+++ b/shims/libdemangle/Android.bp
@@ -0,0 +1,7 @@
+cc_library {
+    name: "libdemangle",
+    vendor_available: true,
+    whole_static_libs: [
+        "libc++demangle",
+    ]
+}