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

Commit 93626d96 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Move remaining libcore JNI libraries to APEX."

parents 8a508cbc b8b08bdd

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -535,6 +535,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) 
# 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)



# 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

# ************************************************

target/product/runtime_libart.mk

+0 −9
Original line number Diff line number Diff line
@@ -33,15 +33,6 @@ PRODUCT_PACKAGES += \ 
PRODUCT_PACKAGES += \

    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.

PRODUCT_PACKAGES += \

    libicui18n \