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

Commit 6dd33369 authored by Chong Zhang's avatar Chong Zhang
Browse files

resolve merge conflicts of 07d4342f to qt-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iba2e59906c6d9dd3dba2cf3ebe88206ae9d7bca9
parents 286127c3 07d4342f

CleanSpec.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

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

target/product/media_system.mk

+0 −22
Original line number Diff line number Diff line
@@ -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 \