diff --git a/Android.bp b/Android.bp index 42c3f45..fc490de 100644 --- a/Android.bp +++ b/Android.bp @@ -174,7 +174,7 @@ cc_prebuilt_library_shared { shared_libs: [ "libhidlbase", "libfmq", - "vendor.mediatek.hardware.videotelephony@1.0", + "vendor.mediatek.hardware.videotelephony@1.0_vendor", "libc", "libutils", "libcutils", @@ -192,7 +192,7 @@ cc_prebuilt_library_shared { shared_libs: [ "libhidlbase", "libfmq", - "vendor.mediatek.hardware.videotelephony@1.0", + "vendor.mediatek.hardware.videotelephony@1.0_vendor", "libc", "libutils", "libcutils", @@ -385,43 +385,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libccci_util", - owner: "infinix", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libccci_util.so", - ], - shared_libs: [ - "libc", - "liblog", - "libc++", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libccci_util.so", - ], - shared_libs: [ - "libc", - "liblog", - "libc++", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libgz_gp_client", owner: "infinix", @@ -777,117 +740,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libmtkcutils", - owner: "infinix", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libmtkcutils.so", - ], - shared_libs: [ - "libmtkrillog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libmtkcutils.so", - ], - shared_libs: [ - "libmtkrillog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmtkproperty", - owner: "infinix", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libmtkproperty.so", - ], - shared_libs: [ - "libmtkrillog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libmtkproperty.so", - ], - shared_libs: [ - "libmtkrillog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libmtkrillog", - owner: "infinix", - strip: { - none: true, - }, - target: { - android_arm: { - srcs: [ - "proprietary/vendor/lib/libmtkrillog.so", - ], - shared_libs: [ - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libmtkrillog.so", - ], - shared_libs: [ - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "both", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libvcodec_oal", owner: "infinix", @@ -1116,7 +968,8 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.mediatek.hardware.videotelephony@1.0", + name: "vendor.mediatek.hardware.videotelephony@1.0_vendor", + stem: "vendor.mediatek.hardware.videotelephony@1.0", owner: "infinix", strip: { none: true, @@ -9884,6 +9737,31 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libccci_util", + owner: "infinix", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libccci_util.so", + ], + shared_libs: [ + "libc", + "liblog", + "libc++", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcmdl", owner: "infinix", @@ -11545,6 +11423,31 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libmtkcutils", + owner: "infinix", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libmtkcutils.so", + ], + shared_libs: [ + "libmtkrillog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libmtkhardware_legacy", owner: "infinix", @@ -11721,6 +11624,56 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libmtkproperty", + owner: "infinix", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libmtkproperty.so", + ], + shared_libs: [ + "libmtkrillog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libmtkrillog", + owner: "infinix", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libmtkrillog.so", + ], + shared_libs: [ + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libmtkrilutils", owner: "infinix", @@ -25900,11 +25853,12 @@ cc_prebuilt_binary { name: "gsm0710muxd", owner: "infinix", target: { - android_arm: { + android_arm64: { srcs: [ "proprietary/vendor/bin/gsm0710muxd", ], shared_libs: [ + "libcutils", "libmtkcutils", "libmtkrillog", "libmtkproperty", @@ -25916,7 +25870,7 @@ cc_prebuilt_binary { ], }, }, - compile_multilib: "32", + compile_multilib: "64", strip: { none: true, }, @@ -26504,7 +26458,7 @@ cc_prebuilt_binary { "liblog", "libbase", "libfmq", - "vendor.mediatek.hardware.videotelephony@1.0", + "vendor.mediatek.hardware.videotelephony@1.0_vendor", "libhardware", "libhwbinder", "libhidlbase", diff --git a/X6837-vendor.mk b/X6837-vendor.mk index 48fa6a9..8adfd7e 100644 --- a/X6837-vendor.mk +++ b/X6837-vendor.mk @@ -658,6 +658,7 @@ PRODUCT_COPY_FILES += \ vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_OP20.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP20.xml \ vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_OP236.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_OP236.xml \ vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \ + vendor/infinix/X6837/proprietary/vendor/etc/ecc_list_tran2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_tran2.xml \ vendor/infinix/X6837/proprietary/vendor/etc/ft8725_fhdp_dsi_vdo_lce_inx_120hz_x6837_cust_color.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ft8725_fhdp_dsi_vdo_lce_inx_120hz_x6837_cust_color.xml \ vendor/infinix/X6837/proprietary/vendor/etc/ft8725_fhdp_dsi_vdo_txd_inx_120hz_x6837_cust_color.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ft8725_fhdp_dsi_vdo_txd_inx_120hz_x6837_cust_color.xml \ vendor/infinix/X6837/proprietary/vendor/etc/gnss/agps_profiles_conf2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/agps_profiles_conf2.xml \ @@ -866,7 +867,6 @@ PRODUCT_PACKAGES += \ libTransNS \ libaedv \ libbwc \ - libccci_util \ libgz_gp_client \ libgz_uree \ libhevce_sb.ca7.android \ @@ -876,16 +876,13 @@ PRODUCT_PACKAGES += \ libipsec_ims_shr \ libkaraoke \ libladder \ - libmtkcutils \ - libmtkproperty \ - libmtkrillog \ libvcodec_oal \ libvcodecdrv_header_stub \ libverno \ libwo \ arm.graphics-V1-ndk_platform \ libmtk_drvb \ - vendor.mediatek.hardware.videotelephony@1.0 \ + vendor.mediatek.hardware.videotelephony@1.0_vendor \ libHEVCdec_sa.ca7.android \ libh264dec_customize \ libh264dec_sa.ca7 \ @@ -1217,6 +1214,7 @@ PRODUCT_PACKAGES += \ libcamera2ndk_vendor \ libcares_naptr \ libcarrierconfig \ + libccci_util \ libcmdl \ libcmdl_ndk.mtk.vndk \ libcodec2_mtk_c2store \ @@ -1273,12 +1271,15 @@ PRODUCT_PACKAGES += \ libmtkcam_pipelinepolicy-aov \ libmtkconfig \ libmtkconfigutils \ + libmtkcutils \ libmtkhardware_legacy \ libmtkisp_metadata \ libmtklimiter_vendor \ libmtkmipc-ril \ libmtknetcap \ libmtknetutils \ + libmtkproperty \ + libmtkrillog \ libmtkrilutils \ libmtkshifter_vendor \ libmtksysutils \ diff --git a/proprietary/vendor/bin/gsm0710muxd b/proprietary/vendor/bin/gsm0710muxd index dcfcf14..aa02499 100755 Binary files a/proprietary/vendor/bin/gsm0710muxd and b/proprietary/vendor/bin/gsm0710muxd differ diff --git a/proprietary/vendor/etc/ecc_list_tran2.xml b/proprietary/vendor/etc/ecc_list_tran2.xml new file mode 100644 index 0000000..725d0df --- /dev/null +++ b/proprietary/vendor/etc/ecc_list_tran2.xml @@ -0,0 +1,750 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/proprietary/vendor/lib/libccci_util.so b/proprietary/vendor/lib/libccci_util.so deleted file mode 100644 index 7544c62..0000000 Binary files a/proprietary/vendor/lib/libccci_util.so and /dev/null differ diff --git a/proprietary/vendor/lib/libmtkcutils.so b/proprietary/vendor/lib/libmtkcutils.so deleted file mode 100644 index ccbeda1..0000000 Binary files a/proprietary/vendor/lib/libmtkcutils.so and /dev/null differ diff --git a/proprietary/vendor/lib/libmtkproperty.so b/proprietary/vendor/lib/libmtkproperty.so deleted file mode 100644 index 6ad44f6..0000000 Binary files a/proprietary/vendor/lib/libmtkproperty.so and /dev/null differ diff --git a/proprietary/vendor/lib/libmtkrillog.so b/proprietary/vendor/lib/libmtkrillog.so deleted file mode 100644 index b2ba34a..0000000 Binary files a/proprietary/vendor/lib/libmtkrillog.so and /dev/null differ