diff --git a/Android.bp b/Android.bp index 0503076..145cd7a 100644 --- a/Android.bp +++ b/Android.bp @@ -6326,7 +6326,6 @@ cc_prebuilt_library_shared { "libmisfpsop", "vendor.qti.hardware.pal@1.0-impl", "vendor.qti.hardware.pal@1.0", - "vendor.qti.hardware.AGMIPC@1.0-impl", "vendor.qti.hardware.AGMIPC@1.0", "libc++", "libc", @@ -6336,6 +6335,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, relative_install_path: "hw", prefer: true, soc_specific: true, @@ -9732,84 +9732,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "lib_bt_aptx", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/lib_bt_aptx.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "lib_bt_ble", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/lib_bt_ble.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "lib_bt_bundle", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/lib_bt_bundle.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "lib_bt_lhdc", owner: "xiaomi", @@ -10015,12 +9937,9 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libagm.so", ], shared_libs: [ - "libar-gsl", "liblog", "libcutils", - "liblx-osal", "libaudioroute", - "libats", "libarmemlog", "libmisight", "libxlog", @@ -10035,33 +9954,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libagmmixer", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libagmmixer.so", - ], - shared_libs: [ - "libtinyalsa", - "libexpat", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -10129,87 +10022,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libar-acdb", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libar-acdb.so", - ], - shared_libs: [ - "liblx-osal", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libar-gpr", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libar-gpr.so", - ], - shared_libs: [ - "liblx-osal", - "libcutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libar-gsl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libar-gsl.so", - ], - shared_libs: [ - "liblx-osal", - "libar-acdb", - "liblx-ar_util", - "libar-gpr", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libar-pal", owner: "xiaomi", @@ -10222,14 +10034,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libar-pal.so", ], shared_libs: [ - "libar-gsl", "liblog", "libexpat", - "liblx-osal", "libaudioroute", "libcutils", "libutilscallstack", - "libagmclient", "libaudioroute_ext", "libvui_intf", "libarmemlog", @@ -10248,6 +10057,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -10266,37 +10076,6 @@ cc_prebuilt_library_shared { shared_libs: [ "liblog", "libexpat", - "liblx-osal", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libats", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libats.so", - ], - shared_libs: [ - "liblx-osal", - "libutils", - "libcutils", - "libdiag", - "libar-gsl", - "libar-acdb", "libc++", "libc", "libm", @@ -10305,6 +10084,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -12510,33 +12290,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcustomva_intf", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcustomva_intf.so", - ], - shared_libs: [ - "liblog", - "libcutils", - "liblx-osal", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcv_common", owner: "xiaomi", @@ -14698,33 +14451,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libhotword_intf", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libhotword_intf.so", - ], - shared_libs: [ - "liblog", - "libcutils", - "liblx-osal", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libhta_hexagon_runtime_snpe", owner: "xiaomi", @@ -16329,64 +16055,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "liblx-ar_util", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/liblx-ar_util.so", - ], - shared_libs: [ - "liblog", - "liblx-osal", - "libxlog", - "libmisight", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "liblx-osal", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/liblx-osal.so", - ], - shared_libs: [ - "liblog", - "libdiag", - "libion", - "libpdmapper", - "libpdnotifier", - "libcutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libmapdata_api", owner: "xiaomi", @@ -16470,12 +16138,9 @@ cc_prebuilt_library_shared { shared_libs: [ "libagm", "libaudioroute", - "libar-acdb", "liblog", "libcutils", - "libats", "libexpat", - "liblx-osal", "libtinyalsa", "libc++", "libc", @@ -16485,6 +16150,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -18929,42 +18595,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libpalclient", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libpalclient.so", - ], - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libutils", - "liblog", - "libcutils", - "libfmq", - "libhardware", - "libbase", - "vendor.qti.hardware.pal@1.0", - "android.hidl.allocator@1.0", - "android.hidl.memory@1.0", - "libhidlmemory", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libpdmapper", owner: "xiaomi", @@ -19417,7 +19047,6 @@ cc_prebuilt_library_shared { "libqc2audio_basecodec", "libcodec2_vndk", "libstagefright_foundation", - "libpalclient", "libc++", "libc", "libm", @@ -19426,6 +19055,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -25161,7 +24791,6 @@ cc_prebuilt_library_shared { shared_libs: [ "liblog", "libcutils", - "liblx-osal", "libc++", "libc", "libm", @@ -25170,6 +24799,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, soc_specific: true, } @@ -28489,40 +28119,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "vendor.qti.hardware.AGMIPC@1.0-impl", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so", - ], - shared_libs: [ - "libhidlbase", - "libutils", - "liblog", - "libcutils", - "libhardware", - "libbase", - "libar-gsl", - "vendor.qti.hardware.AGMIPC@1.0", - "libutilscallstack", - "libagm", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "vendor.qti.hardware.ListenSoundModel@1.0-impl", owner: "xiaomi", @@ -37040,7 +36636,6 @@ cc_prebuilt_library_shared { shared_libs: [ "liblog", "libtinyalsa", - "libagmmixer", "audio.primary.pineapple", "libagm", "libc++", @@ -37051,6 +36646,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, device_specific: true, } @@ -37157,7 +36753,6 @@ cc_prebuilt_library_shared { shared_libs: [ "liblog", "libtinyalsa", - "libagmmixer", "audio.primary.pineapple", "libagm", "libc++", @@ -37168,6 +36763,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, device_specific: true, } @@ -37402,7 +36998,6 @@ cc_prebuilt_library_shared { shared_libs: [ "liblog", "libtinyalsa", - "libagmmixer", "libar-pal", "audio.primary.pineapple", "libagm", @@ -37414,6 +37009,7 @@ cc_prebuilt_library_shared { }, }, compile_multilib: "64", + check_elf_files: false, prefer: true, device_specific: true, } diff --git a/peridot-vendor.mk b/peridot-vendor.mk index ce9461b..03328e0 100644 --- a/peridot-vendor.mk +++ b/peridot-vendor.mk @@ -1351,7 +1351,21 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/peridot/proprietary/vendor/lib64/camera/fdconfigpreviewlite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigpreviewlite.bin \ vendor/xiaomi/peridot/proprietary/vendor/lib64/camera/fdconfigsecure.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigsecure.bin \ vendor/xiaomi/peridot/proprietary/vendor/lib64/camera/fdconfigvideo.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideo.bin \ - vendor/xiaomi/peridot/proprietary/vendor/lib64/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideolite.bin + vendor/xiaomi/peridot/proprietary/vendor/lib64/camera/fdconfigvideolite.bin:$(TARGET_COPY_OUT_VENDOR)/lib64/camera/fdconfigvideolite.bin \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/lib_bt_aptx.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib_bt_aptx.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/lib_bt_ble.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib_bt_ble.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/lib_bt_bundle.so:$(TARGET_COPY_OUT_VENDOR)/lib64/lib_bt_bundle.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libagmmixer.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libagmmixer.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libar-acdb.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libar-acdb.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libar-gpr.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libar-gpr.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libar-gsl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libar-gsl.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libats.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libats.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libcustomva_intf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcustomva_intf.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libhotword_intf.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libhotword_intf.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/liblx-ar_util.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblx-ar_util.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/liblx-osal.so:$(TARGET_COPY_OUT_VENDOR)/lib64/liblx-osal.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/libpalclient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libpalclient.so \ + vendor/xiaomi/peridot/proprietary/vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so PRODUCT_PACKAGES += \ btaudio_offload_if \ @@ -1623,9 +1637,6 @@ PRODUCT_PACKAGES += \ libVoiceSdk \ libWlanServiceJni \ libXMFaceFocus \ - lib_bt_aptx \ - lib_bt_ble \ - lib_bt_bundle \ lib_bt_lhdc \ lib_misound_asc \ libadm \ @@ -1634,15 +1645,10 @@ PRODUCT_PACKAGES += \ libadsp_default_listener \ libadsprpc \ libagm \ - libagmmixer \ libaidenoiser \ libaidenoiserv2 \ - libar-acdb \ - libar-gpr \ - libar-gsl \ libar-pal \ libarmemlog \ - libats \ libaudio_log_utils \ libaudiocloudctrl \ libaudiofeaturestats \ @@ -1712,7 +1718,6 @@ PRODUCT_PACKAGES += \ libcommonchiutils \ libconfigdb \ libcpion \ - libcustomva_intf \ libcv_common \ libdapparamstorage \ libdataitems \ @@ -1785,7 +1790,6 @@ PRODUCT_PACKAGES += \ libhis_face_tracking \ libhistogram \ libhme \ - libhotword_intf \ libhta_hexagon_runtime_snpe \ libiccprofile \ libidl \ @@ -1837,8 +1841,6 @@ PRODUCT_PACKAGES += \ liblowi_common \ liblowi_wifihal \ liblqe \ - liblx-ar_util \ - liblx-osal \ libmapdata_api \ libmasc \ libmcs \ @@ -1921,7 +1923,6 @@ PRODUCT_PACKAGES += \ libops \ libos \ libpal_net_if \ - libpalclient \ libpdmapper \ libpdnotifier \ libperfconfig \ @@ -2242,7 +2243,6 @@ PRODUCT_PACKAGES += \ vendor.qti.diaghal@1.0_vendor \ vendor.qti.gnss-V5-ndk \ vendor.qti.gnss-service \ - vendor.qti.hardware.AGMIPC@1.0-impl \ vendor.qti.hardware.ListenSoundModel@1.0-impl \ vendor.qti.hardware.ListenSoundModel@1.0 \ vendor.qti.hardware.alarm-V1-ndk \