From 10af08c0464a5c3e81a4e2abc2bc330214f75f4d Mon Sep 17 00:00:00 2001 From: Arian Date: Thu, 17 Oct 2024 09:59:21 +0200 Subject: [PATCH] Revert "cupid: Rename audio.primary.taro to audio.primary.taro-cupid to avoid conflicts" This reverts commit c01516521ac0a753c5974857ee015770b93e9b40. Change-Id: I6300bdf18f59131eb7400997b5bcabe0b7d3a831 --- Android.bp | 6 +++--- cupid-vendor.mk | 2 +- ...ry.taro-cupid.so => audio.primary.taro.so} | Bin 846073 -> 736040 bytes proprietary/vendor/lib64/libkaraokepal.so | Bin 76345 -> 61336 bytes 4 files changed, 4 insertions(+), 4 deletions(-) rename proprietary/vendor/lib64/hw/{audio.primary.taro-cupid.so => audio.primary.taro.so} (80%) diff --git a/Android.bp b/Android.bp index cab4717..cbc2791 100644 --- a/Android.bp +++ b/Android.bp @@ -3125,14 +3125,14 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "audio.primary.taro-cupid", + name: "audio.primary.taro", owner: "xiaomi", strip: { none: true, }, target: { android_arm64: { - srcs: ["proprietary/vendor/lib64/hw/audio.primary.taro-cupid.so"], + srcs: ["proprietary/vendor/lib64/hw/audio.primary.taro.so"], shared_libs: ["libbase", "liblog", "libcutils", "libaudioutils", "libexpat", "libhidlbase", "libprocessgroup", "libutils", "libultrasound_notify", "libar-pal", "libresampler", "libhardware_legacy", "libaudiocloudctrl", "gyro_fusion_interface", "libstagefright_foundation", "libtinyalsa", "libxlog", "vendor.qti.hardware.pal@1.0", "libc++", "libc", "libm", "libdl", ], }, }, @@ -4401,7 +4401,7 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: ["proprietary/vendor/lib64/libkaraokepal.so"], - shared_libs: ["libaudioroute", "libaudioutils", "libcutils", "libexpat", "liblog", "libar-pal", "audio.primary.taro-cupid", "libc++", "libc", "libm", "libdl", ], + shared_libs: ["libaudioroute", "libaudioutils", "libcutils", "libexpat", "liblog", "libar-pal", "audio.primary.taro", "libc++", "libc", "libm", "libdl", ], }, }, compile_multilib: "64", diff --git a/cupid-vendor.mk b/cupid-vendor.mk index 0ba2d00..a679194 100644 --- a/cupid-vendor.mk +++ b/cupid-vendor.mk @@ -790,7 +790,7 @@ PRODUCT_PACKAGES += \ com.qualcomm.mcx.policy.mfl \ com.qualcomm.mcx.policy.xr \ com.qualcomm.qti.mcx.usecase.extension \ - audio.primary.taro-cupid \ + audio.primary.taro \ camera.qcom \ camera.xiaomi \ com.qti.chi.override \ diff --git a/proprietary/vendor/lib64/hw/audio.primary.taro-cupid.so b/proprietary/vendor/lib64/hw/audio.primary.taro.so similarity index 80% rename from proprietary/vendor/lib64/hw/audio.primary.taro-cupid.so rename to proprietary/vendor/lib64/hw/audio.primary.taro.so index 210d7622bb604933ee3ffef5508995d8124aae32..67af62f62cf7475113d4019a74d8ed0b22c01181 100644 GIT binary patch delta 9098 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 Q+8!H}mT{!QXN#u&7unyVy8r+H delta 69085 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 Ki2eBFuKxud4w&Tt diff --git a/proprietary/vendor/lib64/libkaraokepal.so b/proprietary/vendor/lib64/libkaraokepal.so index 341f69cd39206c33d37dc124e483e48efbbc14aa..23763ef2e1ad6b87d00bd814ed0a073418562596 100644 GIT binary patch delta 1542 zcmZ{kPe@cj9LHz&J@u(8Z~c?In}7BdMiP}C6drWggrFe7C@G1B&9bsC7I`a>unwJe zmpLeuDG^FuG?xAmq(X;I871V+l@Q!za}_#B9c-I6}K zqQ&hJFFVfaSTGUZS32Qg?wAl;ygG5OO<4SvnCH6CJ#FF>w?&-WiFG?MYuBAy8|>5N z;(!Lpt}6a`4xCPrRbjQUoT=(~IK!#`_iGSmGWsi>U(~oc64kgrXtKbJD`XKAmX-4T z%p8dUdtYPTOFMim1D*pm#(=Y=o(eElCDl3Lwm!^TgbxORL%O^7Xn#Ils{`%=wk`p8 zlDa`w$9xEQ^D^cw!Y3*aZ3Z~|6!T4Vg-d>@SAaiW1y<%qIIvmdMq{K-k@zG&Sw{-4BVEqQLQh%?9`3`WrHy@A513E9(QtT%0 zdzNoLQ41UeZX$EF_X~NePVyLV;4#!$6!wkIJqP^cTE6)(Mau#A-^|C8CiV`MxX}(5 zy!VH_*t-kZcO_q)plcZd?xto^$$N|Gy@9vCKy9F~u|2>mz>M%O!WSsHX}Hnm3(P%@ zh!zHJo`h_Z)IVxqJ^=ijT2V!NDVI5yIu0D6gIT0LOYN`-+)eGE@U(hwU?1JN!loB{ zx0JfcXQ$yBA@gnO^C+-U&}%2@Qe(hN1uu46{tTREngf172UB~mR|4lGK4h}>f@mDg z#7>c`k|li=HQJljGM)}4D_ZZ)@~PybR14Q^jfwZG4OLA(gfF8r$Yq(;qa~te!&koR z(@<6 uabNz`#X{OIdUC#hX;i9oNc{fUD3)CT&kPkg-@@AD!^|-cHJS7O=|QT^tyG9LwL^4R!Y-ZE z=1@>(L>P6^_#pZNSy0d^qlCJpgy61{9y)ZhnfHB1+@(VU16^ie_uZXmo@d_q&9}F? z{oVg!s$eiyw3Z!U8(7s)d`lqYXYdO7hq?~k^u_oGCpI+R%?F(rZxwIXiKPp~4Ebiv zfzSLJp;1+FF3ws5+TVS#dNiu4a@BefT(61ImzC<$f~u+on`iry@_URLT~&FrZ(DlR zZ%9zTRgS8~pfc8K_LVjpr=4ck*G6X4VEG%xsU2qdYa=siu>6hU)DE-!wUHS$SpG(F zYKIj_hZicV^4pWphG*1Z`5VQl9cKA!BQt8S{Egz&4zv8Vkr_2u{zh?XhgtsG$c!2+ zf1^0H!z_PoWJV2^zfqjpVV1u(GNT5|-zZM)Fw0*XnNfq~Zxp9?nB}jH%&5WgH;Pj` z%<|VpX4GK$8^x&|X8CI)GitE>jpEb}v;4J@88!TG{yYA8H(uH9tK&|_yD{D9_*(fM>?RLrmN-p}v% zIn|!?^OnOSnNX>^_9`mhli61qq1&sX@?P;<-BJ~mdzpRFR?=1dR)TF*b0-_--?E{V z{#2iZE`OQX>@7`IlzMMkS_-{s-zmQn;PEx#Xn;k=(BDS8SrAufx3U0Fff{^Xqncvb z)luqMc|VF-(t8ZlASJux?Wg^wLG8PM!^-=d_B#e@K_{xp`*kBGe+P9ik*f}ioyk)u zFOgj(ALJ(AUyo`W)LKeb>pm7JWzQ*4BX`idfQ5ab{f>Zo_k3=0KXo+;YDZVDI$DnF zE`z!=?|ffZk8p*E>WsPJ?=ao*dP4Lfj*l`yBxF_b2qKd)mY6P@Mpkk@^cK zu@>ri5!5$%$-d3lRZXevs%{ibOXU4gg~`W2eMnE8>guVOB}t}1ZKEBzH@3}fmBvYVH<(<(b@wCJL7u4&t zBem{a1*((5aD9Ny<#pxYlf#ZsrgC|;p-hdNxSZ@vHFWoMUQF~{Y3NJzq;|Dm?(R%B I^roQiKOQek5&!@I