From 616dc790439909412b0bf95629f4c2675cd96430 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Tue, 26 Feb 2019 17:40:40 +0000
Subject: [PATCH] Remove libnpt from system again.

http://r.android.com/914573 fixes libjdwp to look for it in the APEX.

Test: Flash and boot
Test: adb forward tcp:5555 jdwp:`adb shell pidof com.android.email` && jdb -attach localhost:5555
Test: atest CtsJdwpTestCases
Bug: 124498388
Change-Id: Idf380660a21c88969e42d6a03a6b50fd2baa4c17
---
 CleanSpec.mk                     | 2 ++
 target/product/runtime_libart.mk | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index f95f0a74e9..be5abe71aa 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -599,6 +599,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libvixld.so)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/dex_bootjars)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/dex_bootjars_input)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libnpt.so)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index c337e9120b..fa35d433ed 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -38,11 +38,6 @@ 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