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

Bug: 347831320
Merged-In: I5793f3fcbd31221a8c47658ad00629bcbf704bc0
Change-Id: I0ef34251c5b5dbe0d64c0efa41a298ca99a48908
This commit is contained in:
Xin Li 2024-08-08 11:15:53 -07:00
commit 8eab67cd39
2 changed files with 16 additions and 2 deletions

View file

@ -322,8 +322,15 @@ PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g
# Increment the SVN for any official public releases
ifdef RELEASE_SVN_CHEETAH
TARGET_SVN ?= $(RELEASE_SVN_CHEETAH)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 60
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=58
ro.vendor.build.svn=$(TARGET_SVN)
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \

View file

@ -305,8 +305,15 @@ PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g
# Increment the SVN for any official public releases
ifdef RELEASE_SVN_PANTHER
TARGET_SVN ?= $(RELEASE_SVN_PANTHER)
else
# Set this for older releases that don't use build flag
TARGET_SVN ?= 60
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=58
ro.vendor.build.svn=$(TARGET_SVN)
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \