From 0b2bb3e3c0faf7e2e8029ba9c8857db573cb7a71 Mon Sep 17 00:00:00 2001 From: ELOHIM Etz Date: Tue, 1 Jul 2025 19:18:02 +0000 Subject: [PATCH] RM6785: Sync with Device Tree Signed-off-by: ELOHIM Etz --- Android.bp | 10 +- Android.mk | 2 +- RM6785-vendor.mk | 3 +- proprietary/system_ext/lib64/libimsma.so | Bin 135848 -> 150056 bytes .../lib64/{libsink.so => libsink-mtk.so} | Bin 270832 -> 294128 bytes proprietary/vendor/bin/hw/mtkfusionrild | Bin 16248 -> 22480 bytes .../vendor/etc/media_codecs_performance.xml | 234 ------------------ 7 files changed, 6 insertions(+), 243 deletions(-) rename proprietary/system_ext/lib64/{libsink.so => libsink-mtk.so} (83%) delete mode 100644 proprietary/vendor/etc/media_codecs_performance.xml diff --git a/Android.bp b/Android.bp index 4ef4299..3669b4b 100644 --- a/Android.bp +++ b/Android.bp @@ -2030,7 +2030,6 @@ cc_prebuilt_library_shared { shared_libs: ["libhidlbase", "vendor.mediatek.hardware.mtkpower@1.0", "liblog", "libcutils", "libutils", "libalsautils-v30", "libhardware_legacy", "libhardware", "libaudioutils", "libtinyalsa", "libtinyxml", "libaudiotoolkit_vendor", "libmedia_helper-v30", "libladder", "android.hardware.audio@6.0", "android.hardware.audio.common-util", "android.hardware.audio.common@6.0", "android.hardware.audio.common@6.0-util", "vendor.mediatek.hardware.audio@6.1", "libaudio_engineer_test", "libtinycompress", "libaedv", "libktveffect", "libktvreverb", "libktvsoundtouch", "libktvdrc", "libktveq", "libktvvolume", "libktveffect_rec", "libktvns", "liboplus_audio_config", "libc++", "libc", "libm", "libdl", ], }, }, - check_elf_files: false, compile_multilib: "32", relative_install_path: "hw", prefer: true, @@ -13138,7 +13137,6 @@ cc_prebuilt_library_shared { shared_libs: ["liblog", "libutils-v30", "libcutils", "libsync", "libladder", "libmtkcam_ulog", "libaedv", "libhidlbase", "android.hidl.allocator@1.0", "android.hardware.graphics.mapper@2.0", "android.hidl.memory@1.0", "libhidlmemory", "libhidltransport", "android.hardware.camera.common@1.0", "vendor.mediatek.hardware.camera.camdump@1.0", "libc++", "libc", "libm", "libdl", ], }, }, - check_elf_files: false, compile_multilib: "64", prefer: true, soc_specific: true, @@ -14690,10 +14688,10 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/system_ext/lib64/libimsma.so"], + shared_libs: ["libbinder", "libcutils", "libgui", "libmedia", "libstagefright", "libstagefright_foundation", "libui", "libutils", "libsink-mtk", "libsource", "libvcodec_cap", "libimsma_rtp", "libcomutils", "liblog", "libsignal", "libnetd_client", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", - check_elf_files: false, prefer: true, system_ext_specific: true, } @@ -14801,14 +14799,14 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libsink", + name: "libsink-mtk", owner: "realme", strip: { none: true, }, target: { android_arm64: { - srcs: ["proprietary/system_ext/lib64/libsink.so"], + srcs: ["proprietary/system_ext/lib64/libsink-mtk.so"], shared_libs: ["libbinder", "libcutils", "libgui", "libmedia", "libstagefright", "libstagefright_foundation", "libui", "libutils", "libcomutils", "libvcodec_cap", "libvt_avsync", "liblog", "libmedia_omx", "libaudioclient", "libc++", "libc", "libm", "libdl", ], }, }, @@ -15703,7 +15701,7 @@ cc_prebuilt_binary { target: { android_arm64: { srcs: ["proprietary/vendor/bin/hw/mtkfusionrild"], - shared_libs: ["libmtkrillog", "libmtkproperty", "libmtkcutils", "librilfusion", "libmtkrilutils", "libsysenv", "libmtkconfigutils", "liblog", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libutils-v32", "libmtkrillog", "libmtkproperty", "libmtkcutils", "librilfusion", "libmtkrilutils", "libsysenv", "libmtkconfigutils", "liblog", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", diff --git a/Android.mk b/Android.mk index dd6463d..3b2a42f 100644 --- a/Android.mk +++ b/Android.mk @@ -4,7 +4,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter RM6785,$(TARGET_DEVICE)),) +ifeq ($(TARGET_DEVICE),RM6785) $(call add-radio-file-sha1-checked,radio/audio_dsp.img,2d87067c80e59eb7c628fb227a11e7fb28d7d5ff) $(call add-radio-file-sha1-checked,radio/cam_vpu1.img,8e4a8148966803847444f93c4ddcd2068e495382) diff --git a/RM6785-vendor.mk b/RM6785-vendor.mk index 9031d5e..a26d4ed 100644 --- a/RM6785-vendor.mk +++ b/RM6785-vendor.mk @@ -583,7 +583,6 @@ PRODUCT_COPY_FILES += \ vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \ vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_mediatek_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_audio.xml \ vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_mediatek_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_mediatek_video.xml \ - vendor/realme/RM6785/proprietary/vendor/etc/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \ vendor/realme/RM6785/proprietary/vendor/etc/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml \ vendor/realme/RM6785/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \ vendor/realme/RM6785/proprietary/vendor/etc/mtk_omx_core.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/mtk_omx_core.cfg \ @@ -1640,7 +1639,7 @@ PRODUCT_PACKAGES += \ libmtk_vt_service \ libmtk_vt_wrapper \ libsignal \ - libsink \ + libsink-mtk \ libsource \ libvcodec_cap \ libvcodec_capenc \ diff --git a/proprietary/system_ext/lib64/libimsma.so b/proprietary/system_ext/lib64/libimsma.so index e53bcfad2b5269f0ebc122535de0d5fb00d3513a..7142314c1c6c14bed87bf1455c856e0bbcc9a43f 100644 GIT binary patch delta 12330 zcmeI2UuauZ9LLYSYe&27<|b*o+;rNc-A1QO7eOS-AW@tS`;hfvEMtQd87yU;>DK8G z2C1ls57Kl|svtBEQSwk|v_c#V(g%?+2JOZ+sxJ*}@6C&Yv4?uj@B6zC7JNQ0=R$kR z`Skbae9!lsr&If>r}k}cDIODXTd1$L52N}!Es|od{OyT>Us5s0a>_X;5_Lpn#8O!F z({CZh4hs<$PI(S=1GL4|83Jt*U9Ey9F^GHeze2(-Z%OKkq=o7yIktBXVq*bSH+bm3 zbt3`L4AIrkKr6g}a2&KqH1Q5-l`}sc0bM4#ejhY}LA>RFZW5h+8`Dc1`*B3|++TKG z)z$12=mm~_d;qa2qVZ2K{RPv14uTelCjP{9}B9UPu&6C;LN}FAT~#|a}xA*jve!`-Z`QZyp&b0yTrTS zB$^(^^l{GI?IQCQQNb(nm8|UtjfGTKoy&+Vapu3npc$g|E12$L+I|7FNHlR1)735% z_E^bfqNN#7E-$Xc5xYrL`~W(!8?gh@LCVi=SasDN0{xv=H2xxJis9NP4VK^}N${8SW}a zw8IkCP(XajTFnvN>8lX?s!24_M9^_|?EORNYKv%PH>kf0gZt1`tY3ANJ_@?db>Co5 zW{Ad%nEsJS&? zL=(G^+3)Hp-&dPN+oPaq-5smX9Sm(M|Idj2_SkB5<-h6j4 ztM@bYjs7|nF#gl2el~0LH~Q;T!1zz6`sVx_{~7=3RKWO8r~2mpGyXIF)2V>*pHB77 z{b&4V{HId^<3FA1oBPlB&-hQL0>*zj)i?K_@t^UZP6dqrbgFOeKjS~+Kb;B~|LIiU z+<&_L_j&6?qjkb6-L~qDv$nl#h4NuMos^H$>1#HkUH0`}E3z=}*hM*n0`{4OTEJei z`WmNQ`?+OB8sj1RjJ1#t*ukhDpC7?9%H}91S{M)5k(KF2k?Rmb3CFZYAl3J-ulDpA<)4Mp=KPcd>G6#T%-R2B#)J SoSFRS(kqv*U3zt@fMCQVG?on)F{=wZ4jnJ%)EOgfP23!Tq{_F_`Y`YTKMCpR?pt6l@yPf^?01Z~*sp zm-N>j(6rFlM=aYl2tCKV(?W|0&=1V})`E6X=$VtCql|ng2)ZdWaT&|Kbr4^m=N`Y~ z`OGKKZ;br90os(%>M76z)b`of@3_zbZe^Z%XL$Q%p@~i`A7SJ=A0lrERosz#l7&{# zu;sX_UWGQx$Ug$0Nuk9dEZ34&c7bMu#vWlgUyH;xPjXgh_8KVDtDy+AYeLmC(1C5x z26Y8F_3R5ct|}d%@3^D0yFueZ=O2PzVcyYB&@{ALs_qxM$JM6LEZ-p0s_yMdMK$edc06ybx+GntgjRWk1td_ncvj;=x7L-#x+)8el_5I9 zie1?YR~tfe+d$o0Xx{->;TFeLq8oIHc@MHClR_gIEI;QtUuWcu&>Tf>#eR41S7>Df z+KY76)(KZ@Le)!98NbRqr5Tw!vclL=IOOCVdjR^A z+9%AL1l>}x`+3e8p+(-HzH}L1*i~kQ#%d7Rb@iM5YE5XR3)Iyg+abgI=Ds~qR~n3(#jZOGCrS$^jO=?OS~_ot=cP@5KH3iI$sX?zfW3-flKJ%|()R!#F>^J@a Dbz|tp diff --git a/proprietary/system_ext/lib64/libsink.so b/proprietary/system_ext/lib64/libsink-mtk.so similarity index 83% rename from proprietary/system_ext/lib64/libsink.so rename to proprietary/system_ext/lib64/libsink-mtk.so index 070c6b0c097c322266d7c543771155ca94f78ace..9357e0447de1e150cb2153a7294e48c5e0824496 100644 GIT binary patch delta 22495 zcmeI4TWnNS6o&U{2UAMhX{Gi8ZRZpL4Jti=mqEpuq972o#T$b_1`#hnVH&BI@Zi)7 zqK2e{gDFO|O;mzH>=;M}vB}`=!H8*1G-*SmjbcKgrt_diqo(e?{&ixQS0DDvItlE~ zeEs)cd#!)3)2E&Pv@-u^Rmu%1FQClhHDEM9M^#vr>i=t1^#_q;wNswXRoB*+t4)s= z8LV7~1~sEesY_LPdV*;8o1lkyqB~oanx$#zGNVm>&ss>;l`Elb(=@0abs$>7^sX78 zNz!&c3vCCl``~=g0iyYLK|Q948$rj2w*L-#kY~>7kIgEW4%V2c#-9Owp6S_nN>ynZ zA=;S&oy~N|Ld=|ib_}$d>G}}%+ox$zT`0zmVjNXb1ayeBl>um@#SkwKW9CVsDHEiA zK4a?L1lm$-Vy;{XdH_=OUKwbdX#3}&!&88d+zi@7G|Jg1VeK#FpgE%Xv(OGQee4#* zJVA7P610wYv{rvKnGDrYRAr!SEVT>W^mK1Zkr)A@Zw# zcp7LQ(aspC%j>S^voJ)|{Swr#;KR2=J4rO}fYxD9gF(=i87Ah;%lP^L=lL8vCr&i_ z8>kxJJPSv+nRl&|^&N z^|{hnD0nj@O$)9s&y zEPG=@)1cbK9qC1mYL5$TsEIQ95N38UsMbpCsEz39C-L>qtesN_ZBo;qsw+dD^@Q|v zTo3I4X*2ghi{DXdWG2^_==iIke4Nw+Q$d3v6IF(L-35L2%(J5g>qdxrNoe23pmNQi z38JUDIR3g}u6`fUc3#l0!e9f|9U?l+Cq;1w{zF@c>Ps|#6bt^1pwtn+zOISc<#k=A zKXDb}L_3#W9P`x`n7M~&_a4wKtX<3A$Pw-D0PSG<$#u|95Y6O4@4=w{@y~CwiK=oP zzV@?mo_*Cu)GNqFEmt8)G!=)I7f?(14LbmO8g!7S{(^HgM$}yf+K)k%^L~S~C|3nh zZLG(RB18*M*|x;dJN{VKdP9gfXu8dM`C{5{Wn zcQfb&*4>JAyO=iUkM#bXZK6`&f*xWTt%bHt)1b<5Cya4aPc6ZIlceqQxV}W&12|qM`EQj$?xG3M7ohd~ z)lNPOeVXcb_cToD@8}G_afV2nKL>4|cl7#gTwl`0xL;|b(zC^X|IRfr7ruX&uyf)> z`%{>?gLia7@5ubc*h6&F51@VrF2-3no|}8e)MU)=BkN24ZDv6HXEXb;nB-sbZ!-hp zKbzT?^Dq7r|Jlrd_|IncrT>Zl#D6w3ApWzNed&MVKk=W<42b`1W?%ZB_)q+2GXvs3 zo7tECC;k)v+020W&t~?e|B3&^e>O89{3`xs@t@5Mi2rP6U;3Z;PyA;y1L8lM z*_Zw&{uBS%%z*gMX7;83iT}iZHZvgpvzdMAf8sy!pUn)2|7>Po`k(ku{AV)*;y;_& zm;NXI6aU%FfcVd5_ND*X_FwD&F8_1c-FvgU9sRE;o84X9oOX`(j+O@|s=QgajjNO| z^g5Lttq4RaoSNSH#z0aJuQdkN_Igc$W6t#KcTIu69H%Bb>IQ0^-h5-Avf0;r3o*~B zRXh<7CD{d0CsZ*{-{glYL;2EN68=R zpXp4;oN(H8!eMh=nwieOf46X|JYOK^k4oRiXrAL`UjHihzf`J@t($jk-MRgm9bMb! J?@Hj8)W2oNls5nX delta 3072 zcmZ9OZERCj7{^byt8B2fcQV)pE4@WPqlQ&{19i4T!9mc~SB5}}h%acNQ}8AGVCM^h zhNLya3?kSjDnTK(Mv`J|QhfVh#B3&-Y$2hG@_|In?gup*HS?V3|GyvTNw%|lfA@c$ z=Q+=Lo-_CF7WYd#>x5zoBhqQ{FQsB?xoXtE+ti$oqv=+kf4I`x*5OxMo~@H_93MWN zw?L`Olz(_i=+HZ$hq=(*JxVRqG&IL(vp-QwD_5?8wog-AJ>i3>m-OCwplQ(#ybNuU zb{|;^S`g}f02(1p-3(e48vhgYAXhHw$FQ=819Od6lP`h3N_zGxrCKzN3LVITE+XBr z3@fLgt%A0aZVVyboTj$AP>+cE=~Z16bX2sq1#PSz;?>Ks^0d&baZ-=3NF%p^cC{Iw z?KPkWAXOhWfhL5;zXlz<1o+skpc$bt?nVQ(zcqtagt}*;Et5WT8+@J;Iynv6&WP6Q zN3)ZmcJZnSw0J4R58MuIpV0hy&>^mz?SwWhbZj?hmh>JSw>eh@p+kE?J)b9*KwA|W zKLWam+M_o?8|aYyz7IN%NqxqMqMF*OL0x?6ruCz-n-XnoK15#jkIn+k2_5JMb!c}Z zYhhHV^DU^C!N=}|c3PdB*4B8+d(y`+SZkCm}TU2dL+jPw%(!IU_WC zEohnA&Io7)^dnGxBxHOZV}6A?H92Zp1#M`)*{fbwr~|1=T!Ad~Y3f(CHMmQgFkYpF z7PrD~k=hrT!2&2Vc!qTIYG|uMBMRD6j3~n#1v-u0vCW_-NIP^fnw}HYRCkq``eQx3 zu2SS_Pl>j+23N4>AN-~=-`Dm1G?lp3GU{0g0X z3zX%g9&Q8;gp5~3_PPtY_RQEZ7j~mUBWY;g!=x%<(3H^AOpa%FIkTS=8mB=o3*}DO z9ThspN>S{~t@-hkKMZk*@2>Ju8N*^M@4AuTkUfR+YS zH*eSi=xNY0m;Q!(RTb*20?lJm&5Sp&Q1+_EtIZvVC@QqJ%AQ<-N=XTgjbX`?w0nW~ zU{0vZD$@s5#+&Raqe3Gyq5Xk%w7-S<73ypP{hiuRwO8h*>$=?d>^=_KOKqN=KOr>2 z46dU#%s!a`rO#d#UZ0HU)q?1cUF>VQDQyiW0dl`^|%3iLH-y?(WmwUEUe3wZ$KjE?^AC+zLpv@jXWK;W{x8ehbYy|`kIy%wbjY#VeE$Pl C?unBC diff --git a/proprietary/vendor/bin/hw/mtkfusionrild b/proprietary/vendor/bin/hw/mtkfusionrild index af347b224a19918a63fb4aa6c5e8e7ec7994028c..e6844f0ebdfee043c0c6d32c9cda2e513e6db9bf 100644 GIT binary patch delta 1690 zcmexScVRu_1O<7900uDFVF95*qyvKm122%2W)R2vdS&PcVCma25?2lRpYsY(8Nm!Okc(`JrV!kW91+pZvor zhf!p6s&z2a<{!2VjFWfR3P|1vf)t%Fx_}A72kNsGpS;6LK++==A_AkEp(+?AFSHV0 zB+R=>xP#e{4XB0%qz+mlqtiE_nqV}?#Fh4w3z#e>R#;44!DKPn0?2$(FnI!_#Uvmv zg3+R$5oj35RCJSI{0rj>l@5u o6omPi3nItRJo%>Kj?J;`g-l{OnMtK3nK{L}WyVH&#raSL06jAJnE(I) delta 189 zcmcbxp7BTB1O<5q1_;<;0c8Lw2L=lU9v~^rAi2@ro{f=jay^?kketqTbhAfj5!2># zoJne%Uj)ry6pUeqXybzFE}A?sWXB|7^UWuWB-j}_CO@>S2a<_a;gc=w1%zO#VRRAG tWGPFz$vdoa7{xZLS_d;t{$VE|X7 diff --git a/proprietary/vendor/etc/media_codecs_performance.xml b/proprietary/vendor/etc/media_codecs_performance.xml deleted file mode 100644 index 5d31e36..0000000 --- a/proprietary/vendor/etc/media_codecs_performance.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -