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

Merge "Remove libjavacrypto from system image."

Browse Source
This commit is contained in:
Treehugger Robot
2019-04-26 18:00:38 +00:00
committed by Gerrit Code Review
parent eccbfd5f4e f9dd05f1bf
commit 4ec15d2c50
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

@@ -625,6 +625,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

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