Merge cherrypicks of ['googleplex-android-review.googlesource.com/27588147', 'googleplex-android-review.googlesource.com/27588342', 'googleplex-android-review.googlesource.com/27628687', 'googleplex-android-review.googlesource.com/27629965', 'googleplex-android-review.googlesource.com/27695359', 'googleplex-android-review.googlesource.com/27695361', 'googleplex-android-review.googlesource.com/27695492', 'googleplex-android-review.googlesource.com/27697196', 'googleplex-android-review.googlesource.com/27697315', 'googleplex-android-review.googlesource.com/27697199', 'googleplex-android-review.googlesource.com/26819775', 'googleplex-android-review.googlesource.com/28321485', 'googleplex-android-review.googlesource.com/28319879', 'googleplex-android-review.googlesource.com/28321741', 'googleplex-android-review.googlesource.com/28321742', 'googleplex-android-review.googlesource.com/28321248', 'googleplex-android-review.googlesource.com/28321785'] into 24Q3-release.

Change-Id: Ie9de6a44f6af346c760ee053a7017f7bd9648941
This commit is contained in:
Android Build Coastguard Worker 2024-07-25 04:16:38 +00:00
commit b3d20ccc13
2 changed files with 16 additions and 2 deletions

View file

@ -395,8 +395,15 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.pm.activetimeout=5
# Increment the SVN for any official public releases
ifdef RELEASE_SVN_HUSKY
TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 35
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=27
ro.vendor.build.svn=$(TARGET_SVN)
# WLC userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))

View file

@ -372,8 +372,15 @@ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.vibrator.hal.pm.activetimeout=5
# Increment the SVN for any official public releases
ifdef RELEASE_SVN_SHIBA
TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 35
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=27
ro.vendor.build.svn=$(TARGET_SVN)
# P23 Devices no longer need rlsservice
PRODUCT_VENDOR_PROPERTIES += \