commit 8c9bbd58c5b13f6fc11bf8061ce35e806a7ebfdb
author Martin Stjernholm <mast@google.com> Wed May 05 14:45:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 05 14:45:22 2021 +0000
tree 5a88a813a134ad080d8f49ca50227fdace26526e
parent 0fe1b0726996fe89d674de3413d96a9716ab0380
parent 7b5e682da17148e6dfe02ad963ba69bc1c6e0eb0

Merge "Require libjdwp from the ART APEX." am: 7b5e682da1

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690795

Change-Id: Ic5b27337868077e32998efffe236ec6767fe73f3

rootdir/etc/linker.config.json

diff --git a/rootdir/etc/linker.config.json b/rootdir/etc/linker.config.json
index a22ef6f..6b03a1d 100644
--- a/rootdir/etc/linker.config.json
+++ b/rootdir/etc/linker.config.json
@@ -1,13 +1,14 @@
 {
   "requireLibs": [
+    "libandroidicu.so",
     "libdexfile.so",
     "libdexfiled.so",
+    "libicu.so",
+    "libjdwp.so",
     "libnativebridge.so",
     "libnativehelper.so",
     "libnativeloader.so",
     "libsigchain.so",
-    "libandroidicu.so",
-    "libicu.so",
     // TODO(b/122876336): Remove libpac.so once it's migrated to Webview
     "libpac.so",
     // TODO(b/120786417 or b/134659294): libicuuc.so