Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ec15d2c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove libjavacrypto from system image."

parents eccbfd5f f9dd05f1

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

# ************************************************

core/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -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 ?=