diff options
| author | Xin Li <delphij@google.com> | 2024-01-17 22:12:36 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-17 22:12:36 -0800 |
| commit | ccca7db766e7f587aff38eace1a3189bd8aa622e (patch) | |
| tree | f68f0f0d09d58fa0448a12edba064f7fa92062ef /device-lynx.mk | |
| parent | 8e993b8f6817b86c33b4a1e3931414ed42bcc569 (diff) | |
| parent | 201e0d7659bc9a62ea8c89e8a48db446b4afa6a8 (diff) | |
| download | lynx-ccca7db766e7f587aff38eace1a3189bd8aa622e.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)temp_319669529
Bug: 319669529
Merged-In: Ib50aa8fb3dc2f55b60fe55d1f4a906846846a396
Change-Id: I494f20227bf8aa75904ede4676eb2d5abf1d296f
Diffstat (limited to 'device-lynx.mk')
| -rw-r--r-- | device-lynx.mk | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/device-lynx.mk b/device-lynx.mk index 242a6ba..a7edbde 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -58,10 +58,12 @@ PRODUCT_PROPERTY_OVERRIDES += ro.odm.build.media_performance_class=33 # Display Config PRODUCT_COPY_FILES += \ - device/google/lynx/lynx/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb + device/google/lynx/lynx/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \ + device/google/lynx/lynx/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb + # Display PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true #config of primary display frames to reach LHBM peak brightness @@ -146,11 +148,18 @@ include device/google/lynx/bluetooth/qti_default.mk # Fingerprint HAL GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/firmware/fingerprint/trunk +endif +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) else -include device/google/gs101/fingerprint/udfps_factory.mk +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # Vibrator HAL @@ -167,6 +176,13 @@ PRODUCT_VENDOR_PROPERTIES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/24Q2 +else +PRODUCT_SOONG_NAMESPACES += vendor/google_devices/lynx/prebuilts/trusty/trunk +endif # GPS xml ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -207,7 +223,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=22 + ro.vendor.build.svn=29 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ @@ -269,7 +285,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ ##Audio Vendor property PRODUCT_PROPERTY_OVERRIDES += \ - persist.vendor.audio.cca.enabled=true + persist.vendor.audio.cca.enabled=false # userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) |