From 976c8e6bd71294429ed29a89265891eedd6bbcc8 Mon Sep 17 00:00:00 2001
From: felkachang <felkachang@google.com>
Date: Wed, 7 Dec 2022 10:47:34 +0800
Subject: [PATCH] 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 | 3 +++
 1 file changed, 3 insertions(+)

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