diff options
| -rw-r--r-- | CleanSpec.mk | 2 | ||||
| -rw-r--r-- | core/Makefile | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 3f1721f8f2..a82a0bd2c1 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -625,6 +625,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl) # Clean up adb_debug.propr $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/adb_debug.prop) + +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjavacrypto.so) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/Makefile b/core/Makefile index 45cb7969a1..747670461d 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2178,6 +2178,7 @@ endif APEX_MODULE_LIBS= \ libadbconnection.so \ libandroidicu.so \ + libandroidio.so \ libdt_fd_forward.so \ libdt_socket.so \ libjavacore.so \ @@ -2190,6 +2191,10 @@ APEX_MODULE_LIBS= \ libopenjdkjvmti.so \ libpac.so \ +# Conscrypt APEX_MODULE_LIBS +APEX_MODULE_LIBS += \ + libjavacrypto.so \ + # An option to disable the check below, for local use since some build targets # still may create these libraries in /system (b/129006418). DISABLE_APEX_LIBS_ABSENCE_CHECK ?= |