commit 976c8e6bd71294429ed29a89265891eedd6bbcc8
author felkachang <felkachang@google.com> Wed Dec 07 10:47:34 2022 +0800
committer felkachang <felkachang@google.com> Wed Dec 07 10:52:07 2022 +0800
tree d2449ab503b7f83933e238ff5e362fbaea3f2e08
parent 7957cfbbc4f97b9469ff0d142f4be641da9f6af5

Ensure libidmap2 exists for all ABIs

The build process doesn't produce the libidmap2 for 32-bit by default.
Android Resources SelfTargeting requires libidmap2. This patch makes
libidmap2 into both 32-bit and 64-bit libraries.

Fixes: 205919743
Test: lunch <device>-userdebug; make clean; make ;\
      test -f $ANDROID_PRODUCT_OUT/system/lib/libidmap2.so \
      && echo 32-bit libidmap2.so exists
Change-Id: Ia1d0338be1416cc3510246737910d2371d2a9e04

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 1bc903a..a43f0b3 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -339,6 +339,9 @@
                 "dnsproxyd_protocol_headers",
                 "libtextclassifier_hash_headers",
             ],
+            runtime_libs: [
+                "libidmap2",
+            ],
         },
         host: {
             cflags: [