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
diff --git a/CleanSpec.mk b/CleanSpec.mk
index f95f0a7..be5abe7 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -599,6 +599,8 @@
$(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 c337e91..fa35d43 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -38,11 +38,6 @@
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