Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future

Bug: 347831320
Merged-In: I60fb3fb1d4ddae9ce7a3b07a5392b12e76c388dc
Change-Id: I30478255fddb311c135448f9925abf8f1c30f788
This commit is contained in:
Xin Li 2024-08-08 11:15:40 -07:00
commit f10b8dce08

View file

@ -217,8 +217,15 @@ PRODUCT_SOONG_NAMESPACES += \
device/google/felix device/google/felix
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
ifdef RELEASE_SVN_FELIX
TARGET_SVN ?= $(RELEASE_SVN_FELIX)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 54
endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=52 ro.vendor.build.svn=$(TARGET_SVN)
# Vibrator HAL # Vibrator HAL
$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))