StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove libjavacrypto from system image.

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

Bug: 123925742
Test: m
Change-Id: Ieea8549d047750cf3580d6fe0204fdf55b6b8394
Merged-In: Ieea8549d047750cf3580d6fe0204fdf55b6b8394
This commit is contained in:
Pete Bentley
2019-04-02 16:40:37 +01:00
parent 46f7e88c27
commit 5a78b371ed
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CleanSpec.mk
View File

@@ -629,6 +629,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/target/common/obj/framework.aidl)
# Clean up adb_debug.propr # 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/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 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

5
core/Makefile
View File

@@ -2231,6 +2231,7 @@ endif
APEX_MODULE_LIBS= \ APEX_MODULE_LIBS= \
libadbconnection.so \ libadbconnection.so \
libandroidicu.so \ libandroidicu.so \
libandroidio.so \
libdt_fd_forward.so \ libdt_fd_forward.so \
libdt_socket.so \ libdt_socket.so \
libjavacore.so \ libjavacore.so \
@@ -2243,6 +2244,10 @@ APEX_MODULE_LIBS= \
libopenjdkjvmti.so \ libopenjdkjvmti.so \
libpac.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 # An option to disable the check below, for local use since some build targets
# still may create these libraries in /system (b/129006418). # still may create these libraries in /system (b/129006418).
DISABLE_APEX_LIBS_ABSENCE_CHECK ?= DISABLE_APEX_LIBS_ABSENCE_CHECK ?=