Merge "resolve merge conflicts of 07d4342fa5 to qt-dev-plus-aosp" into qt-dev-plus-aosp

This commit is contained in:
Chong Zhang 2019-05-15 23:23:11 +00:00 committed by Android (Google) Code Review
commit 936d4fc773
2 changed files with 4 additions and 22 deletions

View File

@ -638,6 +638,10 @@ $(call add-clean-step, rm -rf $(HOST_OUT_JAVA_LIBRARIES)/VeritySigner.jar)
$(call add-clean-step, rm -rf $(HOST_OUT_EXECUTABLES)/build_verity_metadata.py)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libc_malloc*)
# Clean up old location of soft OMX plugins
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libstagefright_soft*)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

View File

@ -31,28 +31,6 @@ PRODUCT_PACKAGES += \
fsck.f2fs \
HTMLViewer \
libfilterpack_imageproc \
libstagefright_soft_aacdec \
libstagefright_soft_aacenc \
libstagefright_soft_amrdec \
libstagefright_soft_amrnbenc \
libstagefright_soft_amrwbenc \
libstagefright_soft_avcdec \
libstagefright_soft_avcenc \
libstagefright_soft_flacdec \
libstagefright_soft_flacenc \
libstagefright_soft_g711dec \
libstagefright_soft_gsmdec \
libstagefright_soft_hevcdec \
libstagefright_soft_mp3dec \
libstagefright_soft_mpeg2dec \
libstagefright_soft_mpeg4dec \
libstagefright_soft_mpeg4enc \
libstagefright_soft_opusdec \
libstagefright_soft_rawdec \
libstagefright_soft_vorbisdec \
libstagefright_soft_vpxdec \
libstagefright_soft_vpxenc \
libstagefright_softomx_plugin \
libwebviewchromium_loader \
libwebviewchromium_plat_support \
make_f2fs \