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

Move remaining libcore JNI libraries to APEX.

Browse Source 
Test: Flash and boot on Taimen
Test: atest CtsLibcoreTestCases CtsJniTestCases
Bug: 119090773
Change-Id: Ia9e7077327d2abc3f637c09acc5933b9c1682d5a
Exempt-From-Owner-Approval: Simple clean steps rule
This commit is contained in:
Pete Bentley
2019-01-11 15:33:43 +00:00
committed by Nicolas Geoffray
parent ba3e26d5da
commit b8b08bdd02
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CleanSpec.mk
View File

@@ -535,6 +535,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
# Remove corrupt generated rule due to using toybox's sed # Remove corrupt generated rule due to using toybox's sed
$(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/system/core/init/generated_stub_builtin_function_map) $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/system/core/init/generated_stub_builtin_function_map)
# Clean up core JNI libraries moved to runtime apex
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libjavacore.so)
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libopenjdk.so)
$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libexpat.so)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

9
target/product/runtime_libart.mk
View File

@@ -33,15 +33,6 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
ext \ ext \
# Why are we pulling in expat, which is used in frameworks, only, it seem?
PRODUCT_PACKAGES += \
libexpat \
# Libcore.
PRODUCT_PACKAGES += \
libjavacore \
libopenjdk \
# Libcore ICU. TODO: Try to figure out if/why we need them explicitly. # Libcore ICU. TODO: Try to figure out if/why we need them explicitly.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libicui18n \ libicui18n \