Merge cherrypicks of ['googleplex-android-review.googlesource.com/27584896', 'googleplex-android-review.googlesource.com/27585950', 'googleplex-android-review.googlesource.com/26823303', 'googleplex-android-review.googlesource.com/28295845', 'googleplex-android-review.googlesource.com/28295692'] into 24Q3-release.
Change-Id: Ibeaf742498a91fcdd2e4121df66059ab4de5bd86
This commit is contained in:
commit
d9189a707b
2 changed files with 16 additions and 2 deletions
|
@ -193,8 +193,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Increment the SVN for any official public releases
|
# Increment the SVN for any official public releases
|
||||||
|
ifdef RELEASE_SVN_ORIOLE
|
||||||
|
TARGET_SVN ?= $(RELEASE_SVN_ORIOLE)
|
||||||
|
else
|
||||||
|
# Set this for older releases that don't use build flag
|
||||||
|
TARGET_SVN ?= 85
|
||||||
|
endif
|
||||||
|
|
||||||
PRODUCT_VENDOR_PROPERTIES += \
|
PRODUCT_VENDOR_PROPERTIES += \
|
||||||
ro.vendor.build.svn=83
|
ro.vendor.build.svn=$(TARGET_SVN)
|
||||||
|
|
||||||
# Set support hide display cutout feature
|
# Set support hide display cutout feature
|
||||||
PRODUCT_PRODUCT_PROPERTIES += \
|
PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
|
|
|
@ -197,8 +197,15 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Increment the SVN for any official public releases
|
# Increment the SVN for any official public releases
|
||||||
|
ifdef RELEASE_SVN_RAVEN
|
||||||
|
TARGET_SVN ?= $(RELEASE_SVN_RAVEN)
|
||||||
|
else
|
||||||
|
# Set this for older releases that don't use build flag
|
||||||
|
TARGET_SVN ?= 85
|
||||||
|
endif
|
||||||
|
|
||||||
PRODUCT_VENDOR_PROPERTIES += \
|
PRODUCT_VENDOR_PROPERTIES += \
|
||||||
ro.vendor.build.svn=83
|
ro.vendor.build.svn=$(TARGET_SVN)
|
||||||
|
|
||||||
# Set support hide display cutout feature
|
# Set support hide display cutout feature
|
||||||
PRODUCT_PRODUCT_PROPERTIES += \
|
PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue