From 737a6528e9520c3588b39da49c168b1863c7f243 Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Mon, 29 Jun 2026 00:09:03 -0400
Subject: [PATCH] klee: Make libformatter MTK specific

* Avoid collisions with Car libraries.

Change-Id: I602b1d65fdf672244a91a3f7c4a71470beae7ea4
---
 Android.bp                                    |   8 ++++----
 klee-vendor.mk                                |   2 +-
 .../vendor/lib64/libcodec2_mtk_vdec.so        | Bin 1809320 -> 1865769 bytes
 .../vendor/lib64/libcodec2_mtk_venc.so        | Bin 1834432 -> 1865049 bytes
 .../{libformatter.so => libformatter_mtk.so}  | Bin 184184 -> 210361 bytes
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename proprietary/vendor/lib64/{libformatter.so => libformatter_mtk.so} (80%)

diff --git a/Android.bp b/Android.bp
index 9af2187..704b76f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4883,7 +4883,7 @@ cc_prebuilt_library_shared {
                 "libcodec2_hidl@1.0",
                 "libcodec2_hidl@1.1",
                 "libcodec2_hidl@1.2",
-                "libformatter",
+                "libformatter_mtk",
                 "libdpframework",
                 "android.hardware.graphics.bufferqueue@2.0",
                 "android.hardware.media.bufferpool2-V2-ndk",
@@ -4955,7 +4955,7 @@ cc_prebuilt_library_shared {
                 "libcodec2_hidl@1.0",
                 "libcodec2_hidl@1.1",
                 "libcodec2_hidl@1.2",
-                "libformatter",
+                "libformatter_mtk",
                 "libdpframework",
                 "android.hardware.graphics.bufferqueue@2.0",
                 "android.hardware.media.bufferpool2-V2-ndk",
@@ -6724,7 +6724,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libformatter",
+    name: "libformatter_mtk",
     owner: "xiaomi",
     strip: {
         none: true,
@@ -6732,7 +6732,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libformatter.so",
+                "proprietary/vendor/lib64/libformatter_mtk.so",
             ],
             shared_libs: [
                 "libion_mtk",
diff --git a/klee-vendor.mk b/klee-vendor.mk
index bb596fc..eff5794 100644
--- a/klee-vendor.mk
+++ b/klee-vendor.mk
@@ -1108,7 +1108,7 @@ PRODUCT_PACKAGES += \
     libfgauge_gm30 \
     libfile_op \
     libforkexecwrap \
-    libformatter \
+    libformatter_mtk \
     libfsmsmartpaparse \
     libfvaudio \
     libged \
diff --git a/proprietary/vendor/lib64/libcodec2_mtk_vdec.so b/proprietary/vendor/lib64/libcodec2_mtk_vdec.so
index 7035022a660e176bfc94f61dae8c5eb0cf6fcdc3..1be5502b687b286ed61b16a7ceeec844142a8586 100644
GIT binary patch
delta 32082
zcmeI*ziU%b6bJD8QfqB$Y^v5Yd6iZxSQ@KEQBo8daS)+s#YJ4if};4NRXd1Fq7KE$
z)Yv{0(ZNM=uuw3AgH9qiSY7Pqq;|7|iy-KE@7^F!<ide-C%+Glujc%^`Q#6{k82m6
zEM2S=no_E$I#v7B(1zxPgo>VpsWba;CkoX!USVo>yjt-J)uR;MUZJ#%3c^s-qaQ!^
z?lAwWzjdur9(}$%%Kf{q_lj<;zjcS+70&3;`%3hOUijy&8~<KdKj?rt=z!^~zq@st
zs=w<8J!XAM)~x#^_PaN>ZGgW`$9)d|?u~65;BV7$pM$@9W7`J!+jQLL;P2kpwgLV&
z9rro-yEnFNfWJ-0eGdNajcps?Z_{y~gTH%Y+XndCblm6Q@7~z90sb}}_c{2xH@0nn
zzfH$|4*u?qZ5!Zk({Z1Jzk6fb2Kd`_+~?r$-q^MQ{x%)=IrzIbwrzmFO~-u>{_c%!
z8{lu#ai2RRykc&)|4Ji%RAE)-IQTQcgv;SC49Xk_e<ql4IsAn|nd9Kk1QRZYzc46s
z9Q>JJ!sYN624#+eKNC#29R9+f%yIB%f(e(yUl^1*4*pCq;d1y3gEGg#p9v;h4u4@#
z<~aB>!Gz1<FAT~Y2Y)7*a5?;iL7C&=&jb@Lhrci=a~%AcV8Z3_7Y1dHgFh2YxE%h%
zpv-abXMzcr!(SMbIS&3zFyV6e3xhJp!Ji2xTn>L>Q06%JGr@$*;V%rz90z|Um~c7#
zg+ZC);LijTE{DG`D03YAnP9@@@D~PUj)OlFOt>8W!l2A?@MnSvm&0EelsOLmOfcbc
z_zQzF$HAWoCR`4GVNm8c_%p$T%i%8!${hD!`Ri+k_l_Lde&17jyldCX<r}H;WUA~@
zBq$mvmQgfPET?FqSV7TDk)&v$SV@thSVhrFk)~*)SWU5pVl72G#X5=%MMo`F&Ypdq
z_%K|%x+{0Ep<zV%!P~*y`nF<TU#FZj*CBtI{4toT{TTGW9Satx{a!B@w9WWKo*x_z
zU%6mv#?J(cGddIarN$g}w$-Kse|N(3Ywz#+AH87lj-PH(=Eh~ZDmrMG_II}Yxw5%4
z*cX0Kzl)jfXbx`B2U$8+bdC{oY4cK_K9(Q6pQg2sXZ&=we&S+Y-z5EI*c?4NTCFmf
zy;unU{hFT}PdwP{C9AD{nQT%mWtyYHqo(}PMx|D(WOXRY&iBN#EgN)pEXo#>Iy)a;
zV@=Ni)B7;Wj&$g(GS_F1_UPVsQTEmM6}rh}`_1HEdT%<u_o?aKmJiQd>5XR#oAl)4
zQ8v9kzW251y%l8#`r^IAruU`J=5_X``9_br_2h3lyD2`o+4Od82~SmSjAwtEZ*(Zi
zrn};MZ<@&^-P;t;o;JPDqU`*t_~g$f`zgv++T*=N^L<<U!&8l~jQ8F%y+cuUwlm(_
zWqQZ@GkxT|Cf@r(|GsKA7yo>&cgKg}%(*k8r^YUwKQS?J^3w716KA(x9t(fr-zQfs
AcK`qY

delta 1053
zcmZ9LKWGzC9LL{XF6LkDT~gaL_fpf^LSsrXB9#jc$tIPcbr8fwa7q`An>cud4%Nv!
zV|<zn6^c-CFd%q?g9SkZhsG?9PC~(<8C((y@t6Dk0=^!6_;K&^zQ6Y#_wH@?{;qe|
zu|iQ+Vrgc&#kojcW&V?Q*Du#*mFhFqs(n+enxk0mf#tTW^BVXeRhoIcu3-Z<s+!ju
z@HdN!F18ob$&}8z$%sGYCQaNq!&rjpVjp#TUe>WW)C1I|DC)L?@l{Hn%lggNrcpE6
z-JN+%-$uRnH;ggT%hdcS>b4=T{f^R~Q9D^#TMO9y5VbKQul<$MnX~@Z@;NzOrt~$^
zOQ?_NU^}ze+$OysH;+*IJ?f31tdHnmzfc<)dF?0ET+jJi+X%_JLg^yv_PE^qH|cw*
zok=-eqH}Mfu8zs+2Br5=x6*PtL+JtNoX(sHIsFO0H*1;l_=nc=gP>PhN_WbeeS52K
zD}V|F01XHNCx8$T1|mQdhyi23Nnjk%0RxBw319*^1xx}{KoXet`gZEkNA=ID_wb^5
zH4xZSnfP8XXX4olc)y}pSZAwOFuh)ZAKns`1~+2={Vrm&!B=9B=_*1MUxov(X#lDS
zH2F#jn)}bFc60b17T23RDGr|VtfGl{ofj1t8Wv5sbug7CHxi>AjcTVXuDs%>#cth?
Z{it(0IQ*Zdyc;k0B~=M~?o0kt`3Ir(!p8sr

diff --git a/proprietary/vendor/lib64/libcodec2_mtk_venc.so b/proprietary/vendor/lib64/libcodec2_mtk_venc.so
index 27b4862e15ff3f9417d54c7f5789788e8accef0f..c4eb7f38fa218b22ddd3ce3773ff1c8348081668 100644
GIT binary patch
delta 31106
zcmeI*yH6BR6bA4+!vedD$U~6FP(bDKP*$R06AHAlA(2Qzh!%=b6Ho+kO@u%;#)1}H
z!x}a5FCf{3Vp~f)jSX1QqOq|8gNkSN-U&Iz-0q%+Z#E~FGiPSLnP2Gd`-9mp-yW@I
zs%zCH)uEc#hPx8mzA7KvYg1QV_?i3%FSAyh%ddKw`~+2}m&wKGg0K|bqmO{Ct)`1s
zeXUX+ov$j-{(s-Z6MbW}>N|8+_>5Mam!m&);L)mY{5LRq(X@Hdw7D-@JN0cUTB8@e
zZas3=srw=F-5c8y;BV7$KZCz}V_O3JZ948}@ON))OMt&k$Ndcc?u~5;@VDu>pTXa~
zu`L1qHXZjf_`5f@CBWaN<9-Hz_r|sa_}g^c&*1Og*p>i)n~wV#{M{Sd65wysaX*8<
zdt+My{B1h!XYhA#Y)gQ@O~?HV{_c%!3Glb+xSzq_y|FC;{x%)=vt#J5lutiT|MFYC
zwfQ@J9r<E!JpZt-YV&RH)7UXYVgG6Pe#Rl*z+ar41;U?kh&S*TCuf21XB^@U{Kd&x
zAp9AJcmscNaux`G#v$IoU!0r;!k=-7H}DrHXMyl%9O4c9#mQM9{27OM1AlRH76^aF
zA>P1WoSX&1pK*vc@E0d%f$(P>;tl-8$yp%$8HacSe{pga2!F;Q-oRg+oCU(4afmnY
z7bj<d@Mj$24gAH)Ss?rwhj;^jadH+2f5su+z+ar41;U?kh&S*TCuf21XB^@U{Kd&x
zAp9AJcmscNaux`G#v$IoU!0r;!k=-7H}DrHXMyl%9O4c9#mQM9{27OM1AlRH76^aF
zA>P1WoSX$7H-Eiz>*dk0f!CfI@}50kTv}ON@~C{O3aS`YB~=wwHC3D{L6xMcp*lfT
zOLdZ}j;fxjfvS<}6jc*dGu3IT7OK|L;!@lAZ-0EG^m(EEkAHsD>?T`dc9D&CpRF|g
zZc6V`n>79OinrWe@|J_ch4uX)<+T^O_k&?CC`{3kXg62I3qSUQ!EpF9$W?}C8%i5L
zgCXAwN?#9xEpL4<sHezi%iWGbuoqmcIob-hqi`cU5$$nHd*2q`(22?Dbw|x+xUW(=
zF?>+CGjCkCw7IT6rfI35GW!9m=yP^cdiUPx5p$tg;-#*!*j2wUcM!xjv;MU+ZAmqn
zN|dJ)=9*lmQjIE^-|23l>0Cdb-s;lRx}I=af0j@C%yhUsUA>^Ezrt6iW5Y~m^>k2A
zznkeur+)Ig^0e5)pS)wHAIsD90Dp4POb^S`Pv)JY+?OV|zqh3^snRAl`rgf^^!P~d
bVCwe0+4-5tZ1(Q_&6(`|bB|}~jmyVh`hpek

delta 808
zcmZ9KJxCj27{}lDa?wkoO*DSQycu*dHj%`lc;KL$2pOD07ik9(478?Og-8kx>DHuI
zc!d_~>L8qSxUr6ItuCc>=xU{N<3}|9FYoh$>3jV6-`(%I=ee(+7q5<Qw(53om@Tms
zOEwlKLV1IAR=%;h?2PmBd&724xb4)r-8i=!t}WdgVNRPUDpTqIxvDxaou+ry7HgAZ
zQMQ^6b=*^`sE#u>$f9y<GBpZa&UNeO6H0$pIyT*{v!uT%U7uCD#Z~u1(rwc7O8+HY
zpxL=}XSVyeyZLX@&y>zT>2B_ley8+zx^q4I1I_+QSJQ0$+>9C6xO19`JL}n$<7O=9
zWwz(br_5{9J5Q&Ih22u6R;qAdfB-N-5cGgvV1W<_g9zvY{ooOZf*2S8gCGuuz%UpA
zqafjxDq|bB#>I+vww=5)W{&A|M%3$L3CbYlP+skX>9|<qJ4ui4i1xO8(-N`Bga1H&
zY>BzZTk43Ezx)&XbOI^Gt(cqAGj;BzRdWmBe<wfvm5^8eM2?$sswoz^B{vZ({y*q1
wU8If}D`6)9Xc*HsuCrLsl`6SBYKnO@|I-xJpx<@GdvPfi3~qS`*Ww4i2c<BVjsO4v

diff --git a/proprietary/vendor/lib64/libformatter.so b/proprietary/vendor/lib64/libformatter_mtk.so
similarity index 80%
rename from proprietary/vendor/lib64/libformatter.so
rename to proprietary/vendor/lib64/libformatter_mtk.so
index 6b746bdbdb85d4c120c8c955096320405bca7b74..2f292c3510ba869a2c5380be1f97d08038228115 100644
GIT binary patch
delta 16947
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

delta 3160
zcmZ9OZD^ZS6vuC#^d)WDJxSZOO>Ipo70Q&Q-Kqr3Oa>0txsk9bR78@&#Fr0iJ_z=M
zkl^Z8P-wbT9?@YlQ5j5Zz?Zf#Z1+KEWm}3B6cJiqkfK5=bhLv(y!Zb97i=$-OYblL
zbIv{YocrAQzZ-Tw^yVV9^&%!ZMaN{cyROd?di3T0bu~}EF^~_r(wD7Be#sTd=UkD=
zjmTs%(qAQiqyEzT_1-xFBf`v8v-c|2i?uG>N!GgC0=8I5x%5vO_`_hM5KY2%CV<6D
zz+0Ha{e8d-z&RiMPEp<64qOKIori3k>Vs0<E&NW<1K;&fuTy={4RsuN^8{p{QGKo!
zI0Kw|9_wRNZwG*9Xgmx&YSh)hYrwu^ST~_v^$X#bq1kmhv_cr6-JrU!9_lFY%Hvos
z5ZBZJj{v6{p!S)KwJ75OXIf#IqD5eJaBA$xKb7;6F%H~G<GuTVE5O+*;0>)6qR6a;
z>viP03CKdk>r6`$IN{#y`@9TIpEq!-8|r`PJL3Ufpz%HD?d6e_fn&8W{sVmvG4h~S
zhn5nsI!ydbGmOW97mq{TOW!|nV;SJYQLMi#m(}>72I?8$7|;71P;r;)HR7jXya$u`
zoaJCQ=+F}VFmB3W+Y94S;;(>v<bKsS)C4>NoIL`o=NS1(mcul#xQz9WiHD>GeclTD
zMeI$em$YdiMrphPbzdW}sq+92G~B2o-+U6dg~rc30OLvER6j9|e`NX_cyBp)i5F<R
z4(fHP=h|Sr47@T3ryKPBwQM4_vEV)(TH4+nTA0-m2M)aeSs#s0$aYcc46z4lQ|C=Q
zu^Hfm8|o|c{U~$32Aus3>s73l6Rl`L+m@lp4BmwCUiv;w<57ievB|r|bm%Mkb_h5l
zP^Z|yroXc?ExNy<E;Pe;1U^KT`z`_JlE4Fu{52c<t^lu>v2IH7dp1$nr$ZBmVKv3b
z-<Pw>T9Wwn-Rf=j*aUF#0Mw>ShUIOfuDu0dUkrGi#>d$PW#AAm50kZ3sn+N1*P#_g
z;M+9tT^3VZ;eZ%s);u(RoOPaodXaT*x@19yqKwZd>=&LaLJLtn#k8zZ&Aa73llm+_
zHFlHsy|c&nHw-PRu>1-R!g!JDao&m}z_CYwr|5f>X_;2oFA5icO<E?I^Ad1kY<J|J
zN+)V#6&TO*p7*d)w`9>N9BxKvO;8Urw0BvlN#M;_u|7w9QWlds&<Wteb*x{L-J!;F
za%1|ufkXUI4S<R(EaWoParpj&#!t&xpLdH6Ef>W4E#ka9S%u@kd#mLyxiQrx8Q>Ui
z%Q^TEetu$SfLGG6>Z5U0RLc08!hVrvQe%w#u$&dP_v_F??T}q#Qpcqeg`>df955$Q
z!(ti%-W)<qPtkWZKQ+_9DYl@wkq`0OD*+e1P^TH%@A~TTI~Cx?Bd}_oRI9wW!mT>;
zO+LuBs6NF?O#&D5P`@YZTa8ZB-@xK$;4$v|PkG*I-wVKd-z}Hqvrpl&!T}LsmzaC)
zHaj%frbFwy3FGR$qQ(t=iQ>TNQ`oop#C|J(qKs#Ni+q@TskK5}r|}u8tD*jd_@4Y%
zsn>wlnHKX-eL`-`FB%-X-Q9M;7Af9LJyd^!n@QyOjx(|^7CUxoXA|x2MArpR?2;$u
zn)Sr2;xSjunSaYFxn%;Jw=Y^<{<()>NfxCZiP`y!R^_M@xnudf|9fRSXYN>!c~yC-
zA!jGA77ARDv$HA}0?e#=`UxQeRKw$Rm#j8tZprF(RXM*dSy7i<T9#9lb9PyhNXhaw
qnP|+M=yE!4TMs&;%UX7I*~(PQ?h>uD4}WJ3S}xD**<03+uKxgPo_iMn