From c54c3e9d7c1b082ce5ac91e87a183fafee09b06c Mon Sep 17 00:00:00 2001 From: vannashcroft Date: Tue, 7 Apr 2026 12:57:27 +0200 Subject: [PATCH] emerald: Bring back media C2 prebuilt services --- Android.bp | 53 ++++++++++++++++++ emerald-vendor.mk | 3 + ...android.hardware.media.c2@1.2-mediatek-64b | Bin 0 -> 68993 bytes .../android.hardware.media.c2@1.2-mediatek.rc | 7 +++ .../manifest_media_c2_V1_2_default.xml | 11 ++++ 5 files changed, 74 insertions(+) create mode 100644 proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b create mode 100644 proprietary/vendor/etc/init/android.hardware.media.c2@1.2-mediatek.rc create mode 100644 proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_2_default.xml diff --git a/Android.bp b/Android.bp index 0879ea9..e7be659 100644 --- a/Android.bp +++ b/Android.bp @@ -33970,6 +33970,15 @@ prebuilt_etc_xml { soc_specific: true, } +prebuilt_etc_xml { + name: "manifest_media_c2_V1_2_default.xml", + owner: "xiaomi", + src: "proprietary/vendor/etc/vintf/manifest/manifest_media_c2_V1_2_default.xml", + filename_from_src: true, + sub_dir: "vintf/manifest", + soc_specific: true, +} + prebuilt_etc_xml { name: "manifest_vendor.dolby.hardware.dms.xml", owner: "xiaomi", @@ -34210,6 +34219,50 @@ cc_prebuilt_binary { soc_specific: true, } +cc_prebuilt_binary { + name: "android.hardware.media.c2@1.2-mediatek-64b", + owner: "xiaomi", + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b", + ], + shared_libs: [ + "libstagefright_foundation-v33", + "libbase", + "liblog", + "libcodec2", + "libutils", + "android.hardware.media.c2@1.0", + "android.hardware.media.c2@1.1", + "android.hardware.media.c2@1.2", + "libcodec2_hidl@1.0", + "libcodec2_hidl@1.1", + "libcodec2_hidl@1.2", + "libcodec2_vndk", + "libhidlbase", + "libavservices_minijail", + "libbinder", + "libcodec2_mtk_c2store", + "libcodec2_mtk_vdec", + "libcodec2_mtk_venc", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + check_elf_files: false, + strip: { + none: true, + }, + prefer: true, + relative_install_path: "hw", + soc_specific: true, +} + cc_prebuilt_binary { name: "android.hardware.neuralnetworks-shim-service-mtk", owner: "xiaomi", diff --git a/emerald-vendor.mk b/emerald-vendor.mk index cc25125..2289eaf 100644 --- a/emerald-vendor.mk +++ b/emerald-vendor.mk @@ -498,6 +498,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/emerald/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.4-service.widevine.rc \ vendor/xiaomi/emerald/proprietary/vendor/etc/init/android.hardware.gnss-service.mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss-service.mediatek.rc \ vendor/xiaomi/emerald/proprietary/vendor/etc/init/android.hardware.graphics.allocator@4.0-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.graphics.allocator@4.0-service-mediatek.rc \ + vendor/xiaomi/emerald/proprietary/vendor/etc/init/android.hardware.media.c2@1.2-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.media.c2@1.2-mediatek.rc \ vendor/xiaomi/emerald/proprietary/vendor/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc \ vendor/xiaomi/emerald/proprietary/vendor/etc/init/android.hardware.security.keymint-service.mitee.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint-service.mitee.rc \ vendor/xiaomi/emerald/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \ @@ -1911,6 +1912,7 @@ PRODUCT_PACKAGES += \ manifest_apuware_apusys.xml \ manifest_apuware_hmp.xml \ manifest_apuware_utils.xml \ + manifest_media_c2_V1_2_default.xml \ manifest_vendor.dolby.hardware.dms.xml \ vendor.xiaomi.sensor.citsensorservice@2.0-service.xml \ batterysecret \ @@ -1920,6 +1922,7 @@ PRODUCT_PACKAGES += \ gsm0710muxd \ android.hardware.drm@1.4-service.widevine \ android.hardware.gnss-service.mediatek \ + android.hardware.media.c2@1.2-mediatek-64b \ android.hardware.neuralnetworks-shim-service-mtk \ android.hardware.security.keymint@1.0-service.mitee \ android.hardware.graphics.allocator@4.0-service-mediatek.mt6789 \ diff --git a/proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b b/proprietary/vendor/bin/hw/android.hardware.media.c2@1.2-mediatek-64b new file mode 100644 index 0000000000000000000000000000000000000000..50ecf9f7a48dc6b8bbead67f8fc1b61dcdd32fb3 GIT binary patch literal 68993 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 + + android.hardware.media.c2 + hwbinder + 1.2 + + IComponentStore + default + + +