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

Commit eecac2ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move mediacodec to vendor partition."

parents 93e29c08 4658418c

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/liboboe*) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/liboboe*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj_arm/STATIC_LIBRARIES/liboboe*)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj_arm/SHARED_LIBRARIES/liboboe*)

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

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/mediacodec.rc)



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

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

services/mediacodec/Android.mk

+4 −2
Original line number Diff line number Diff line
@@ -41,9 +41,11 @@ LOCAL_C_INCLUDES := \ 
    $(TOP)/frameworks/av/media/libstagefright \

    $(TOP)/frameworks/av/media/libstagefright/include \

    $(TOP)/frameworks/native/include/media/openmax

LOCAL_MODULE := mediacodec

LOCAL_MODULE := android.hardware.media.omx@1.0-service

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_PROPRIETARY_MODULE := true

LOCAL_32_BIT_ONLY := true

LOCAL_INIT_RC := mediacodec.rc

LOCAL_INIT_RC := android.hardware.media.omx@1.0-service.rc

include $(BUILD_EXECUTABLE)



# service seccomp policy

services/mediacodec/mediacodec.rc→services/mediacodec/android.hardware.media.omx@1.0-service.rc

+1 −1
Original line number Diff line number Diff line 
service mediacodec /system/bin/mediacodec

service mediacodec /vendor/bin/hw/android.hardware.media.omx@1.0-service

    class main

    user mediacodec

    group camera drmrpc mediadrm