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

Commit f9dd05f1 authored by Pete Bentley's avatar Pete Bentley
Browse files

Remove libjavacrypto from system image. 

The only copy needed is the one in the Conscrypt APEX.

Bug: 123925742
Test: m
Change-Id: Ieea8549d047750cf3580d6fe0204fdf55b6b8394
parent 3129d2c9

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 ?=