Merge cherrypicks of ['googleplex-android-review.googlesource.com/28156922', 'googleplex-android-review.googlesource.com/28189884', 'googleplex-android-review.googlesource.com/28256077', 'googleplex-android-review.googlesource.com/28397176'] into 24Q3-release.
Change-Id: I3a0af64b1043c6dc4fa657d0f2450854b535e3ee
This commit is contained in:
commit
e3b10c7b99
1 changed files with 8 additions and 1 deletions
|
@ -69,8 +69,15 @@ include device/google/gs-common/touch/gti/predump_gti_dual.mk
|
||||||
include device/google/gs-common/display/dump_second_display.mk
|
include device/google/gs-common/display/dump_second_display.mk
|
||||||
|
|
||||||
# Increment the SVN for any official public releases
|
# Increment the SVN for any official public releases
|
||||||
|
ifdef RELEASE_SVN_COMET
|
||||||
|
TARGET_SVN ?= $(RELEASE_SVN_COMET)
|
||||||
|
else
|
||||||
|
# Set this for older releases that don't use build flag
|
||||||
|
TARGET_SVN ?= 04
|
||||||
|
endif
|
||||||
|
|
||||||
PRODUCT_VENDOR_PROPERTIES += \
|
PRODUCT_VENDOR_PROPERTIES += \
|
||||||
ro.vendor.build.svn=1
|
ro.vendor.build.svn=$(TARGET_SVN)
|
||||||
|
|
||||||
# go/lyric-soong-variables
|
# go/lyric-soong-variables
|
||||||
$(call soong_config_set,lyric,camera_hardware,comet)
|
$(call soong_config_set,lyric,camera_hardware,comet)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue