Merge "Disable installation of ART modules in /system."

# Clean up previous default location of RROs

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay)

# Remove ART artifacts installed only by modules `art-runtime` and

# `art-tools` in /system on target.

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dalvikvm)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dalvikvm32)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dalvikvm64)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dex2oat)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dex2oatd)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dexdiag)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dexdump)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dexlist)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dexoptanalyzer)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/dexoptanalyzerd)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/oatdump)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/profman)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/profmand)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libadbconnection.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libadbconnectiond.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libart-compiler.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libartd-compiler.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libart-dexlayout.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libartd-dexlayout.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libart-disassembler.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libart.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libartd.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libartbase.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libartbased.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libdexfile.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libdexfiled.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libdexfile_external.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libdexfile_support.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libdt_fd_forward.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libdt_socket.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjdwp.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libnpt.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libopenjdkd.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libopenjdkjvm.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libopenjdkjvmd.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libopenjdkjvmti.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libopenjdkjvmtid.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libprofile.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libprofiled.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libtombstoned_client.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libvixl.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libvixld.so)

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

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

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

    libicui18n \

    libicuuc \

# ART.

PRODUCT_PACKAGES += art-runtime

# ART/dex helpers.

PRODUCT_PACKAGES += art-tools

# Android Runtime APEX module.

PRODUCT_PACKAGES += com.android.runtime