From fd0b822d09db8390bb20502d3fd1b4d628b33dd2 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Fri, 15 Feb 2019 14:28:18 +0000
Subject: [PATCH] Add libnpt back into system.

It must be there for libjdwp to find it and load the debugger transport
correctly. This is a temporary fix while we are looking into loading libnpt
from the Runtime APEX.

Bug: 124498388
Test: adb forward tcp:5555 jdwp:`adb shell pidof com.android.email` && jdb -attach localhost:5555
Test: atest CtsJdwpTestCases
Change-Id: I644c092c2ad5f6c9669bdccc24c7953d3be6b328
---
 target/product/runtime_libart.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index f1f807d2b4..35c45daf9c 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -38,6 +38,11 @@ PRODUCT_PACKAGES += \
     libicui18n \
     libicuuc \
 
+# TODO(b/124498388): This currently needs to be in /system/lib for the debugger
+# transport to work.
+PRODUCT_PACKAGES += \
+    libnpt
+
 # Android Runtime APEX module.
 PRODUCT_PACKAGES += com.android.runtime