diff --git a/Android.mk b/Android.mk index a8ba0ae..e612a75 100644 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,7 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter berlin berlna dubai xpeng,$(TARGET_DEVICE)),) +ifneq ($(filter bangkk fogos,$(TARGET_DEVICE)),) subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH)) $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk))) @@ -101,12 +101,9 @@ $(RFS_MSM_WPSS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld $(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @echo "Creating wifi firmware symlinks: $@" - @mkdir -p $@/wlan - @mkdir -p $@/qca6490 - @mkdir -p $@/qca6750 - $(hide) ln -sf /mnt/vendor/persist/wlan/wlan_mac.bin $@/wlan/wlan_mac.bin - $(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/qca6490/WCNSS_qcom_cfg.ini - $(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/qca6750/WCNSS_qcom_cfg.ini + @mkdir -p $@ + $(hide) ln -sf /mnt/vendor/persist/wlan_mac.bin $@/wlan_mac.bin + $(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini ALL_DEFAULT_INSTALLED_MODULES += $(RFS_MSM_ADSP_SYMLINKS) $(RFS_MSM_CDSP_SYMLINKS) $(RFS_MSM_MPSS_SYMLINKS) \ $(RFS_MSM_WPSS_SYMLINKS) $(RFS_MSM_SLPI_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 189f7d5..82e9af1 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -16,7 +16,7 @@ BOARD_VENDOR := motorola -COMMON_PATH := device/motorola/sm7325-common +COMMON_PATH := device/motorola/sm6375-common # Architecture TARGET_ARCH := arm64 @@ -58,12 +58,11 @@ BOARD_KERNEL_SEPARATED_DTBO := true BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_RAMDISK_USE_LZ4 := true TARGET_KERNEL_ADDITIONAL_FLAGS := DTC_EXT=$(shell pwd)/prebuilts/misc/linux-x86/dtc/dtc LLVM=1 -TARGET_KERNEL_SOURCE := kernel/motorola/sm7325 -TARGET_KERNEL_CONFIG := vendor/lahaina-qgki_defconfig vendor/lineage_moto-lahaina.config +TARGET_KERNEL_SOURCE := kernel/motorola/sm6375 # Platform BOARD_USES_QCOM_HARDWARE := true -TARGET_BOARD_PLATFORM := lahaina +TARGET_BOARD_PLATFORM := holi BOARD_ROOT_EXTRA_SYMLINKS := \ /vendor/fsg:/fsg @@ -206,4 +205,4 @@ WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true WPA_SUPPLICANT_VERSION := VER_0_8_X # inherit from the proprietary version -include vendor/motorola/sm7325-common/BoardConfigVendor.mk +include vendor/motorola/sm6375-common/BoardConfigVendor.mk diff --git a/audio/sku_yupik/audio_io_policy.conf b/audio/sku_holi/audio_io_policy.conf similarity index 53% rename from audio/sku_yupik/audio_io_policy.conf rename to audio/sku_holi/audio_io_policy.conf index 2c3df01..351bb90 100644 --- a/audio/sku_yupik/audio_io_policy.conf +++ b/audio/sku_holi/audio_io_policy.conf @@ -18,56 +18,123 @@ outputs { bit_width 16 app_type 69937 } - voip_rx { - flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT + proaudio { + flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW formats AUDIO_FORMAT_PCM_16_BIT sampling_rates 48000 bit_width 16 + app_type 69943 + } + voip_rx { + flags AUDIO_OUTPUT_FLAG_VOIP_RX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 8000|16000|32000|48000 + bit_width 16 app_type 69946 } + deep_buffer { + flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69936 + } direct_pcm_16 { flags AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000 + sampling_rates 48000|96000 bit_width 16 - app_type 69936 + app_type 69937 } direct_pcm_24 { flags AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 + sampling_rates 48000|96000 bit_width 24 app_type 69940 } direct_pcm_32 { flags AUDIO_OUTPUT_FLAG_DIRECT formats AUDIO_FORMAT_PCM_32_BIT - sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 + sampling_rates 48000|96000 bit_width 32 app_type 69942 } + compress_passthrough { + flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH + formats AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD|AUDIO_FORMAT_DSD + sampling_rates 48000 + bit_width 16 + app_type 69941 + } compress_offload_16 { flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 44100|48000|88200|96000|176400|192000 + sampling_rates 48000|96000 bit_width 16 - app_type 69936 + app_type 69937 } compress_offload_24 { flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING - formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 - sampling_rates 44100|48000|88200|96000|176400|192000 + formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2|AUDIO_FORMAT_AAC_LATM_LC|AUDIO_FORMAT_AAC_LATM_HE_V1|AUDIO_FORMAT_AAC_LATM_HE_V2 + sampling_rates 48000|96000 bit_width 24 app_type 69940 } } inputs { - voip_tx { - flags AUDIO_INPUT_FLAG_VOIP_TX + record_16bit { formats AUDIO_FORMAT_PCM_16_BIT sampling_rates 48000 bit_width 16 + app_type 69938 + } + record_24bit { + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT + sampling_rates 48000 + bit_width 24 + app_type 69948 + } + record_32bit { + formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT + sampling_rates 48000 + bit_width 32 + app_type 69949 + } + record_compress_16 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69938 + } + record_compress_24 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT + sampling_rates 48000 + bit_width 24 + app_type 69948 + } + record_compress_32 { + flags AUDIO_INPUT_FLAG_COMPRESS + formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT + sampling_rates 48000 + bit_width 32 + app_type 69949 + } + voip_tx { + flags AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 8000|16000|32000|48000 + bit_width 16 app_type 69946 } + low_latency_voip_tx { + flags AUDIO_INPUT_FLAG_FAST|AUDIO_INPUT_FLAG_VOIP_TX + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type + } } diff --git a/audio/sku_yupik/sound_trigger_mixer_paths.xml b/audio/sku_holi/sound_trigger_mixer_paths.xml similarity index 85% rename from audio/sku_yupik/sound_trigger_mixer_paths.xml rename to audio/sku_holi/sound_trigger_mixer_paths.xml index 7eb0b4d..009286e 100644 --- a/audio/sku_yupik/sound_trigger_mixer_paths.xml +++ b/audio/sku_holi/sound_trigger_mixer_paths.xml @@ -49,29 +49,43 @@ + + + + + + + + + + + + + + + + - - - - + + @@ -217,75 +231,72 @@ - + - - - + + + + + - - - - - - - - - - - + + + - + + + - - + + + + + + + + + + + + + + + + - - - - - - + - + - - - + - - - - - - - + @@ -294,4 +305,5 @@ + diff --git a/audio/sku_yupik/sound_trigger_platform_info.xml b/audio/sku_holi/sound_trigger_platform_info.xml similarity index 98% rename from audio/sku_yupik/sound_trigger_platform_info.xml rename to audio/sku_holi/sound_trigger_platform_info.xml index 46f79d8..acb373f 100644 --- a/audio/sku_yupik/sound_trigger_platform_info.xml +++ b/audio/sku_holi/sound_trigger_platform_info.xml @@ -42,7 +42,7 @@ - + @@ -88,7 +88,6 @@ - @@ -126,7 +125,7 @@ - + @@ -138,7 +137,7 @@ - + @@ -313,11 +312,11 @@ - + - + @@ -458,7 +457,7 @@ - + diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp index dc5c7cb..ea51dc3 100644 --- a/bootctrl/Android.bp +++ b/bootctrl/Android.bp @@ -31,14 +31,14 @@ cc_defaults { } cc_library { - name: "bootctrl.lahaina", + name: "bootctrl.holi", defaults: ["bootctrl_hal_defaults"], - static_libs: ["libgptutils.moto_lahaina"], + static_libs: ["libgptutils.moto_holi"], } cc_library_shared { name: "android.hardware.boot@1.1-impl-qti", stem: "android.hardware.boot@1.0-impl-1.1-qti", defaults: ["android.hardware.boot@1.1-impl-qti_defaults"], - static_libs: ["libgptutils.moto_lahaina"], + static_libs: ["libgptutils.moto_holi"], } diff --git a/common.mk b/common.mk index 2289d73..53afd8b 100644 --- a/common.mk +++ b/common.mk @@ -72,8 +72,8 @@ PRODUCT_PACKAGES += \ android.hardware.boot@1.1-impl-qti \ android.hardware.boot@1.1-impl-qti.recovery \ android.hardware.boot@1.1-service \ - bootctrl.lahaina \ - bootctrl.lahaina.recovery + bootctrl.holi \ + bootctrl.holi.recovery PRODUCT_PACKAGES_DEBUG += \ bootctl @@ -97,7 +97,7 @@ PRODUCT_PACKAGES += \ android.hardware.soundtrigger@2.3-impl \ audioadsprpcd \ audio.bluetooth.default \ - audio.primary.lahaina \ + audio.primary.holi \ audio.r_submix.default \ audio.usb.default \ libaudiopreprocessing \ @@ -110,12 +110,12 @@ PRODUCT_PACKAGES += \ libqcomvoiceprocessing \ libreverbwrapper \ libvisualizer \ - sound_trigger.primary.lahaina + sound_trigger.primary.holi PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/audio/sku_yupik/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/audio_io_policy.conf \ - $(LOCAL_PATH)/audio/sku_yupik/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/sound_trigger_mixer_paths.xml \ - $(LOCAL_PATH)/audio/sku_yupik/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_yupik/sound_trigger_platform_info.xml + $(LOCAL_PATH)/audio/sku_holi/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/audio_io_policy.conf \ + $(LOCAL_PATH)/audio/sku_holi/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/sound_trigger_mixer_paths.xml \ + $(LOCAL_PATH)/audio/sku_holi/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_holi/sound_trigger_platform_info.xml PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ @@ -258,7 +258,7 @@ PRODUCT_PACKAGES += \ # LiveDisplay PRODUCT_PACKAGES += \ - vendor.lineage.livedisplay@2.1-service.motorola_lahaina + vendor.lineage.livedisplay@2.1-service.motorola_holi # Media PRODUCT_COPY_FILES += \ @@ -269,14 +269,14 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.xml PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/lahaina/media_codecs_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina.xml \ - $(LOCAL_PATH)/media/lahaina/media_codecs_performance_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina.xml \ - $(LOCAL_PATH)/media/lahaina/media_profiles_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_lahaina.xml + $(LOCAL_PATH)/media/holi/media_codecs_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_holi.xml \ + $(LOCAL_PATH)/media/holi/media_codecs_performance_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_holi.xml \ + $(LOCAL_PATH)/media/holi/media_profiles_holi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_holi.xml PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/yupik/media_codecs_performance_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v1.xml \ - $(LOCAL_PATH)/media/yupik/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \ - $(LOCAL_PATH)/media/yupik/media_profiles_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_yupik_v1.xml + $(LOCAL_PATH)/media/blair/media_codecs_performance_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_blair.xml \ + $(LOCAL_PATH)/media/blair/media_codecs_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_blair.xml \ + $(LOCAL_PATH)/media/blair/media_profiles_blair.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_blair.xml PRODUCT_COPY_FILES += \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_audio.xml \ @@ -354,35 +354,17 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ - frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.ambient_temperature.xml \ - frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.barometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.compass.xml \ - frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.gyroscope.xml \ - frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.hifi_sensors.xml \ - frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.light.xml \ - frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.proximity.xml \ - frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.relative_humidity.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.stepcounter.xml \ - frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.barometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.compass.xml \ - frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.gyroscope.xml \ - frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.hifi_sensors.xml \ - frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.light.xml \ - frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.proximity.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.stepcounter.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_lahaina/android.hardware.sensor.stepdetector.xml \ - frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.accelerometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.barometer.xml \ - frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.compass.xml \ - frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.gyroscope.xml \ - frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.hifi_sensors.xml \ - frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.light.xml \ - frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.proximity.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.stepcounter.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_shima/android.hardware.sensor.stepdetector.xml \ - frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_yupik/android.hardware.sensor.stepdetector.xml + frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.ambient_temperature.xml \ + frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.relative_humidity.xml \ + frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ + frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ + frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hifi_sensors.xml \ + frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \ + frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ + frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ + frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/product_privapp-permissions-hotword.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-hotword.xml @@ -537,4 +519,4 @@ PRODUCT_BOOT_JARS += \ WfdCommon # Inherit from vendor blobs -$(call inherit-product, vendor/motorola/sm7325-common/sm7325-common-vendor.mk) +$(call inherit-product, vendor/motorola/sm6375-common/sm6375-common-vendor.mk) diff --git a/configs/hotword-hiddenapi-package-whitelist.xml b/configs/hotword-hiddenapi-package-whitelist.xml index c470f2c..4fdfb0a 100644 --- a/configs/hotword-hiddenapi-package-whitelist.xml +++ b/configs/hotword-hiddenapi-package-whitelist.xml @@ -4,6 +4,5 @@ This XML file declares which platform apps that need to access internal APIs. --> - diff --git a/configs/public.libraries.txt b/configs/public.libraries.txt index 590c2a0..b4e15cf 100644 --- a/configs/public.libraries.txt +++ b/configs/public.libraries.txt @@ -1,3 +1,4 @@ +libportrait_repair_ppl3_ocl.so libqti-perfd-client.so libadsprpc.so libcdsprpc.so @@ -10,3 +11,7 @@ libqmi_common_so.so libqmiservices.so libqmimotext.so libiqi_bridge.so +liblowlight_ai_portrait.arcsoft.so + +libBSTbase_share.so +libBSTSWAD.so diff --git a/configs/telephony_system-ext_privapp-permissions-qti.xml b/configs/telephony_system-ext_privapp-permissions-qti.xml index 88a4521..1e50dbc 100644 --- a/configs/telephony_system-ext_privapp-permissions-qti.xml +++ b/configs/telephony_system-ext_privapp-permissions-qti.xml @@ -46,7 +46,6 @@ It allows additional grants on top of privapp-permissions-platform.xml - diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp index 7245770..fd90b79 100644 --- a/gpt-utils/Android.bp +++ b/gpt-utils/Android.bp @@ -16,7 +16,7 @@ cc_library { - name: "libgptutils.moto_lahaina", + name: "libgptutils.moto_holi", vendor: true, recovery_available: true, shared_libs: [ diff --git a/lineage.dependencies b/lineage.dependencies index ef3bb55..966666e 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,7 +1,7 @@ [ { - "repository": "android_kernel_motorola_sm7325", - "target_path": "kernel/motorola/sm7325" + "repository": "android_kernel_motorola_sm6375", + "target_path": "kernel/motorola/sm6375" }, { "repository": "android_hardware_motorola", diff --git a/livedisplay/Android.bp b/livedisplay/Android.bp index 3054f94..70d3372 100644 --- a/livedisplay/Android.bp +++ b/livedisplay/Android.bp @@ -13,7 +13,7 @@ // limitations under the License. cc_defaults { - name: "livedisplay_motorola_lahaina", + name: "livedisplay_motorola_holi", defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ @@ -39,8 +39,8 @@ cc_defaults { } cc_binary { - name: "vendor.lineage.livedisplay@2.1-service.motorola_lahaina", - init_rc: ["vendor.lineage.livedisplay@2.1-service.motorola_lahaina.rc"], - defaults: ["livedisplay_motorola_lahaina"], + name: "vendor.lineage.livedisplay@2.1-service.motorola_holi", + init_rc: ["vendor.lineage.livedisplay@2.1-service.motorola_holi.rc"], + defaults: ["livedisplay_motorola_holi"], vendor: true, } diff --git a/livedisplay/service.cpp b/livedisplay/service.cpp index b287cb5..e19eeaa 100644 --- a/livedisplay/service.cpp +++ b/livedisplay/service.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "vendor.lineage.livedisplay@2.1-service.motorola_lahaina" +#define LOG_TAG "vendor.lineage.livedisplay@2.1-service.motorola_holi" #include #include diff --git a/livedisplay/vendor.lineage.livedisplay@2.1-service.motorola_lahaina.rc b/livedisplay/vendor.lineage.livedisplay@2.1-service.motorola_holi.rc similarity index 92% rename from livedisplay/vendor.lineage.livedisplay@2.1-service.motorola_lahaina.rc rename to livedisplay/vendor.lineage.livedisplay@2.1-service.motorola_holi.rc index a039511..12a66b7 100644 --- a/livedisplay/vendor.lineage.livedisplay@2.1-service.motorola_lahaina.rc +++ b/livedisplay/vendor.lineage.livedisplay@2.1-service.motorola_holi.rc @@ -5,7 +5,7 @@ on init chown system system /sys/devices/platform/soc/soc:qcom,dsi-display-primary/dsi_display_dc chmod 0660 /sys/devices/platform/soc/soc:qcom,dsi-display-primary/dsi_display_dc -service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.motorola_lahaina +service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.motorola_holi class late_start user system group system diff --git a/media/yupik/media_codecs_yupik_v1.xml b/media/blair/media_codecs_blair.xml similarity index 54% rename from media/yupik/media_codecs_yupik_v1.xml rename to media/blair/media_codecs_blair.xml index 5896733..5981e02 100644 --- a/media/yupik/media_codecs_yupik_v1.xml +++ b/media/blair/media_codecs_blair.xml @@ -1,6 +1,6 @@ - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -230,65 +204,60 @@ - + - - - - + + + - - - + + - + - - - - + + + - - - + + - - - + + + - + - + - - + + - + - diff --git a/media/blair/media_codecs_performance_blair.xml b/media/blair/media_codecs_performance_blair.xml new file mode 100644 index 0000000..56886e0 --- /dev/null +++ b/media/blair/media_codecs_performance_blair.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/yupik/media_profiles_yupik_v1.xml b/media/blair/media_profiles_blair.xml similarity index 76% rename from media/yupik/media_profiles_yupik_v1.xml rename to media/blair/media_profiles_blair.xml index 6bf5c3c..281432d 100644 --- a/media/yupik/media_profiles_yupik_v1.xml +++ b/media/blair/media_profiles_blair.xml @@ -1,25 +1,25 @@ - + @@ -116,9 +116,9 @@ - - -