diff --git a/common.mk b/common.mk
index 922765e..2b738b7 100644
--- a/common.mk
+++ b/common.mk
@@ -507,3 +507,57 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.sys.disable_rescue=true
 endif
+
+# Media
+PRODUCT_PACKAGES += \
+    libmm-omxcore \
+    android.hardware.media.c2@1.0.vendor
+
+# Enable Codec 2.0
+PRODUCT_PACKAGES += \
+    libqcodec2_base \
+    libqcodec2_utils \
+    libqcodec2_platform \
+    libqcodec2_core \
+    libqcodec2_basecodec \
+    libqcodec2_v4l2codec \
+    vendor.qti.media.c2@1.0-service \
+    codec2.vendor.ext-arm64.policy \
+    codec2.vendor.base-arm64.policy
+
+# Media codecs C2
+PRODUCT_PACKAGES += \
+    codec2play \
+    libcodec2_soft_aacdec \
+    libcodec2_soft_aacenc \
+    libcodec2_soft_amrnbdec \
+    libcodec2_soft_amrwbdec \
+    libcodec2_soft_amrnbenc \
+    libcodec2_soft_amrwbenc \
+    libcodec2_soft_av1dec_aom \
+    libcodec2_soft_avcdec \
+    libcodec2_soft_avcenc \
+    libcodec2_soft_common \
+    libcodec2_soft_flacdec \
+    libcodec2_soft_flacenc \
+    libcodec2_soft_g711alawdec \
+    libcodec2_soft_g711mlawdec \
+    libcodec2_soft_av1dec_gav1 \
+    libcodec2_soft_gsmdec \
+    libcodec2_soft_hevcdec \
+    libcodec2_soft_hevcenc \
+    libcodec2_soft_mp3dec \
+    libcodec2_soft_mpeg2dec \
+    libcodec2_soft_mpeg4dec \
+    libcodec2_soft_h263dec \
+    libcodec2_soft_mpeg4enc \
+    libcodec2_soft_h263enc \
+    libcodec2_soft_opusdec \
+    libcodec2_soft_opusenc \
+    libcodec2_soft_rawdec \
+    libcodec2_soft_vorbisdec \
+    libcodec2_soft_vp9dec \
+    libcodec2_soft_vp8dec \
+    libcodec2_soft_vp9enc \
+    libcodec2_soft_vp8enc \
+    libcodec2_soft_xaacdec