diff --git a/Android.bp b/Android.bp index 5fa724f..da20727 100644 --- a/Android.bp +++ b/Android.bp @@ -6483,6 +6483,46 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "audio.primary.lahaina", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/hw/audio.primary.lahaina.so", + ], + shared_libs: [ + "libbase", + "liblog", + "libcutils", + "libtinyalsa", + "libtinycompress", + "libaudioroute", + "libaudioutils", + "libexpat", + "libhidlbase", + "libprocessgroup", + "libutils", + "lib_lvacfs", + "liblvacfs_wrapper", + "libaudio_log_utils", + "android.hardware.power@1.2", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + relative_install_path: "hw", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libFileMux_proprietary", owner: "nothing", @@ -6536,6 +6576,214 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "liba2dpoffload", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/liba2dpoffload.so", + ], + shared_libs: [ + "libaudioutils", + "libcutils", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudioroute", + "libexpat", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libadm", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libadm.so", + ], + shared_libs: [ + "liblog", + "libcutils", + "libtinyalsa", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libaudio_log_utils", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libaudio_log_utils.so", + ], + shared_libs: [ + "libutils", + "libcutils", + "libexpat", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libaudioconfigstore", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libaudioconfigstore.so", + ], + shared_libs: [ + "libexpat", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libaudioparsers", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libaudioparsers.so", + ], + shared_libs: [ + "libutils", + "liblog", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libbatterylistener", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libbatterylistener.so", + ], + shared_libs: [ + "android.hardware.health@1.0", + "android.hardware.health@2.0", + "android.hardware.power@1.2", + "libaudioroute", + "libaudioutils", + "libbase", + "libcutils", + "libexpat", + "libhidlbase", + "liblog", + "libtinyalsa", + "libtinycompress", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcomprcapture", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libcomprcapture.so", + ], + shared_libs: [ + "libaudioutils", + "libcutils", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudioroute", + "libexpat", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcppf", owner: "nothing", @@ -6564,6 +6812,7 @@ cc_prebuilt_library_shared { cc_prebuilt_library_shared { name: "libdirac", + name: "libdrc", owner: "nothing", strip: { none: true, @@ -6577,6 +6826,142 @@ cc_prebuilt_library_shared { "liblog", "libm", "libc", + "proprietary/vendor/lib/libdrc.so", + ], + shared_libs: [ + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libexthwplugin", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libexthwplugin.so", + ], + shared_libs: [ + "libaudioroute", + "libaudioutils", + "libcutils", + "libexpat", + "liblog", + "libtinyalsa", + "libtinycompress", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libhdmiedid", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libhdmiedid.so", + ], + shared_libs: [ + "libaudioutils", + "libcutils", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudioroute", + "libexpat", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libhdmipassthru", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libhdmipassthru.so", + ], + shared_libs: [ + "libaudioparsers", + "libaudioroute", + "libaudioutils", + "libcutils", + "libexpat", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libhfp", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libhfp.so", + ], + shared_libs: [ + "libaudioroute", + "libaudioutils", + "libcutils", + "libexpat", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", +>>>>>>> bf04747 (Revert "Spacewar: Switch to oss audio HAL") ], }, }, @@ -6667,6 +7052,153 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libqtigef", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libqtigef.so", + ], + shared_libs: [ + "liblog", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libsndmonitor", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libsndmonitor.so", + ], + shared_libs: [ + "libaudioutils", + "libcutils", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudioroute", + "libexpat", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libspkrprot", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libspkrprot.so", + ], + shared_libs: [ + "libaudioutils", + "libcutils", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudioroute", + "libexpat", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libssrec", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libssrec.so", + ], + shared_libs: [ + "libaudioutils", + "libcutils", + "liblog", + "libtinyalsa", + "libtinycompress", + "libaudioroute", + "libexpat", + "libprocessgroup", + "libaudio_log_utils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libsurround_3mic_proc", + owner: "nothing", + strip: { + none: true, + }, + target: { + android_arm: { + srcs: [ + "proprietary/vendor/lib/libsurround_3mic_proc.so", + ], + shared_libs: [ + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "32", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libwfdcodecv4l2_proprietary", owner: "nothing", diff --git a/Spacewar-vendor.mk b/Spacewar-vendor.mk index 2535e06..7b6bcf1 100644 --- a/Spacewar-vendor.mk +++ b/Spacewar-vendor.mk @@ -158,11 +158,13 @@ PRODUCT_COPY_FILES += \ vendor/nothing/Spacewar/proprietary/vendor/etc/apdr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/apdr.conf \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio/sku_yupik/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_io_policy.conf \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio/sku_yupik/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_platform_info_intcodec.xml \ + vendor/nothing/Spacewar/proprietary/vendor/etc/audio/sku_yupik/audio_platform_info_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_platform_info_yupikqrd.xml \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio/sku_yupik/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_tuning_mixer.txt \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio/sku_yupik/sound_trigger_mixer_paths_yupikqrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/sound_trigger_mixer_paths_yupikqrd.xml \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio/sku_yupik/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/sound_trigger_platform_info.xml \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \ + vendor/nothing/Spacewar/proprietary/vendor/etc/audio_platform_info_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_qrd.xml \ vendor/nothing/Spacewar/proprietary/vendor/etc/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ vendor/nothing/Spacewar/proprietary/vendor/etc/camera/camxoverridesettings.txt:$(TARGET_COPY_OUT_VENDOR)/etc/camera/camxoverridesettings.txt \ vendor/nothing/Spacewar/proprietary/vendor/etc/camera/vidhance_calibration:$(TARGET_COPY_OUT_VENDOR)/etc/camera/vidhance_calibration \ @@ -650,13 +652,31 @@ PRODUCT_PACKAGES += \ vendor.qti.hardware.vpp@2.0 \ vendor.qti.hardware.wifidisplaysession@1.0_vendor \ vendor.qti.qspmhal@1.0 \ + audio.primary.lahaina \ libFileMux_proprietary \ lib_lvacfs \ + liba2dpoffload \ + libadm \ + libaudio_log_utils \ + libaudioconfigstore \ + libaudioparsers \ + libbatterylistener \ + libcomprcapture \ libcppf \ libdirac \ + libdrc \ + libexthwplugin \ + libhdmiedid \ + libhdmipassthru \ + libhfp \ liblvacfs_wrapper \ libmmrtpdecoder_proprietary \ libmmrtpencoder_proprietary \ + libqtigef \ + libsndmonitor \ + libspkrprot \ + libssrec \ + libsurround_3mic_proc \ libwfdcodecv4l2_proprietary \ libwfdcommonutils_proprietary \ libwfdconfigutils_proprietary \ diff --git a/proprietary/vendor/etc/audio/sku_yupik/audio_platform_info_yupikqrd.xml b/proprietary/vendor/etc/audio/sku_yupik/audio_platform_info_yupikqrd.xml new file mode 100644 index 0000000..6ee9c88 --- /dev/null +++ b/proprietary/vendor/etc/audio/sku_yupik/audio_platform_info_yupikqrd.xml @@ -0,0 +1,679 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary/vendor/etc/audio_platform_info_qrd.xml b/proprietary/vendor/etc/audio_platform_info_qrd.xml new file mode 100644 index 0000000..8ed6245 --- /dev/null +++ b/proprietary/vendor/etc/audio_platform_info_qrd.xml @@ -0,0 +1,474 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary/vendor/lib/hw/audio.primary.lahaina.so b/proprietary/vendor/lib/hw/audio.primary.lahaina.so new file mode 100644 index 0000000..399f8ee Binary files /dev/null and b/proprietary/vendor/lib/hw/audio.primary.lahaina.so differ diff --git a/proprietary/vendor/lib/liba2dpoffload.so b/proprietary/vendor/lib/liba2dpoffload.so new file mode 100644 index 0000000..52be337 Binary files /dev/null and b/proprietary/vendor/lib/liba2dpoffload.so differ diff --git a/proprietary/vendor/lib/libadm.so b/proprietary/vendor/lib/libadm.so new file mode 100644 index 0000000..08a7d60 Binary files /dev/null and b/proprietary/vendor/lib/libadm.so differ diff --git a/proprietary/vendor/lib/libaudio_log_utils.so b/proprietary/vendor/lib/libaudio_log_utils.so new file mode 100644 index 0000000..a59a092 Binary files /dev/null and b/proprietary/vendor/lib/libaudio_log_utils.so differ diff --git a/proprietary/vendor/lib/libaudioconfigstore.so b/proprietary/vendor/lib/libaudioconfigstore.so new file mode 100644 index 0000000..c33c69e Binary files /dev/null and b/proprietary/vendor/lib/libaudioconfigstore.so differ diff --git a/proprietary/vendor/lib/libaudioparsers.so b/proprietary/vendor/lib/libaudioparsers.so new file mode 100644 index 0000000..b463aa0 Binary files /dev/null and b/proprietary/vendor/lib/libaudioparsers.so differ diff --git a/proprietary/vendor/lib/libbatterylistener.so b/proprietary/vendor/lib/libbatterylistener.so new file mode 100644 index 0000000..1e33a43 Binary files /dev/null and b/proprietary/vendor/lib/libbatterylistener.so differ diff --git a/proprietary/vendor/lib/libcomprcapture.so b/proprietary/vendor/lib/libcomprcapture.so new file mode 100644 index 0000000..469492b Binary files /dev/null and b/proprietary/vendor/lib/libcomprcapture.so differ diff --git a/proprietary/vendor/lib/libdrc.so b/proprietary/vendor/lib/libdrc.so new file mode 100644 index 0000000..2799c22 Binary files /dev/null and b/proprietary/vendor/lib/libdrc.so differ diff --git a/proprietary/vendor/lib/libexthwplugin.so b/proprietary/vendor/lib/libexthwplugin.so new file mode 100644 index 0000000..fca98ad Binary files /dev/null and b/proprietary/vendor/lib/libexthwplugin.so differ diff --git a/proprietary/vendor/lib/libhdmiedid.so b/proprietary/vendor/lib/libhdmiedid.so new file mode 100644 index 0000000..261efa4 Binary files /dev/null and b/proprietary/vendor/lib/libhdmiedid.so differ diff --git a/proprietary/vendor/lib/libhdmipassthru.so b/proprietary/vendor/lib/libhdmipassthru.so new file mode 100644 index 0000000..992038b Binary files /dev/null and b/proprietary/vendor/lib/libhdmipassthru.so differ diff --git a/proprietary/vendor/lib/libhfp.so b/proprietary/vendor/lib/libhfp.so new file mode 100644 index 0000000..628be9b Binary files /dev/null and b/proprietary/vendor/lib/libhfp.so differ diff --git a/proprietary/vendor/lib/libqtigef.so b/proprietary/vendor/lib/libqtigef.so new file mode 100644 index 0000000..e35e31e Binary files /dev/null and b/proprietary/vendor/lib/libqtigef.so differ diff --git a/proprietary/vendor/lib/libsndmonitor.so b/proprietary/vendor/lib/libsndmonitor.so new file mode 100644 index 0000000..c0aa0ef Binary files /dev/null and b/proprietary/vendor/lib/libsndmonitor.so differ diff --git a/proprietary/vendor/lib/libspkrprot.so b/proprietary/vendor/lib/libspkrprot.so new file mode 100644 index 0000000..5e199e7 Binary files /dev/null and b/proprietary/vendor/lib/libspkrprot.so differ diff --git a/proprietary/vendor/lib/libssrec.so b/proprietary/vendor/lib/libssrec.so new file mode 100644 index 0000000..b730a8f Binary files /dev/null and b/proprietary/vendor/lib/libssrec.so differ diff --git a/proprietary/vendor/lib/libsurround_3mic_proc.so b/proprietary/vendor/lib/libsurround_3mic_proc.so new file mode 100644 index 0000000..18384fc Binary files /dev/null and b/proprietary/vendor/lib/libsurround_3mic_proc.so differ