openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Remove libjavacrypto from system image." am: 4ec15d2c50 

am: 229ba6c8ee

Change-Id: Ic879fa9a3b3137182ab77150fee563303148f3d4
This commit is contained in:
Pete Bentley 2019-04-26 11:14:36 -07:00 committed by android-build-merger
parent a943dcb4b1 229ba6c8ee
commit c3b9f66cd1
2 changed files with 7 additions and 0 deletions
Show Stats 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

@ -2179,6 +2179,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 \
@ -2191,6 +2192,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 ?=