Clean up ART APEX manifests.

manifest-art.json: Rely on the build system to populate all required
libs. Besides some duplicate entries, this drops libicuuc.so,
libicui18n.so, and libneuralnetworks.so from the required list. None of
those libraries are dependencies of the ART module itself, and hence
don't get loaded from the ART namespace. They used to be necessary
before linkerconfig supported creating links for JNI libs and from
public.libraries.txt, and when libnativeloader still defaulted to the
ART namespace for loading such libs.

test_apex_manifest.json: Used by test_com.android.art and should be
identical to manifest-art.json except for the version number. Besides
the above, this file contained several stale libraries.

Also try to configure proper runtime_libs dependencies for libart(d)
for the things it dlopen's from the ART namespace, although most
libraries cannot be listed there for various reasons.

Cherry-picked from https://r.android.com/1742176.

Test: m droid deapexer
      deapexer info \
        out/target/product/vsoc_x86_64/system/apex/com.android.art.capex
  Compare the output before and after this CL.
Test: m test_com.android.art deapexer
      deapexer info \
        out/target/product/vsoc_x86_64/obj/ETC/test_com.android.art_intermediates/test_com.android.art.apex
  Compare the output before and after this CL.
Bug: 184148353
Change-Id: I0d9c2a090702a95551208aad4be97ea867004a3c
Merged-In: I0d9c2a090702a95551208aad4be97ea867004a3c

2 files changed, 3 insertions, 27 deletions

diff --git a/build/apex/manifest-art.json b/build/apex/manifest-art.json
index 4bbd03e1db..43a49c8795 100644
--- a/build/apex/manifest-art.json
+++ b/build/apex/manifest-art.json
@@ -5,10 +5,6 @@
     "libjdwp.so"
   ],
   "requireNativeLibs": [
-    "libicu.so",
-    "libicuuc.so",
-    "libicui18n.so",
-    "libicu_jni.so",
-    "libneuralnetworks.so"
+    "libicu_jni.so"
   ]
 }
diff --git a/build/apex/test_apex_manifest.json b/build/apex/test_apex_manifest.json
index a264d7a9a7..ee6dacbc6f 100644
--- a/build/apex/test_apex_manifest.json
+++ b/build/apex/test_apex_manifest.json
@@ -2,29 +2,9 @@
   "name": "com.android.art",
   "version": 2147483647,
   "provideNativeLibs": [
-    "libandroidio.so",
-    "libdexfile_external.so",
-    "libdexfiled_external.so",
-    "libjdwp.so",
-    "libnativebridge.so",
-    "libnativehelper.so",
-    "libnativeloader.so",
-    "libsigchain.so"
+    "libjdwp.so"
   ],
   "requireNativeLibs": [
-    "heapprofd_client_api.so",
-    "libadbconnection_client.so",
-    "libc.so",
-    "libdl.so",
-    "libdl_android.so",
-    "libicu.so",
-    "libicuuc.so",
-    "libicui18n.so",
-    "libicu_jni.so",
-    "liblog.so",
-    "libm.so",
-    "libneuralnetworks.so",
-    "libstatssocket.so",
-    "libz.so"
+    "libicu_jni.so"
   ]
 }