Merge cherrypicks of ['googleplex-android-review.googlesource.com/28157898', 'googleplex-android-review.googlesource.com/28189571', 'googleplex-android-review.googlesource.com/28256128', 'googleplex-android-review.googlesource.com/28410131'] into 24Q3-release.
Change-Id: I7294f657ce362469f6b14b4dbedb0e56eeeadb15
This commit is contained in:
commit
6f455bcfcb
3 changed files with 24 additions and 3 deletions
|
@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
|
||||||
include device/google/gs-common/pixelsupport/pixelsupport.mk
|
include device/google/gs-common/pixelsupport/pixelsupport.mk
|
||||||
|
|
||||||
# Increment the SVN for any official public releases
|
# Increment the SVN for any official public releases
|
||||||
|
ifdef RELEASE_SVN_CAIMAN
|
||||||
|
TARGET_SVN ?= $(RELEASE_SVN_CAIMAN)
|
||||||
|
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,caiman)
|
$(call soong_config_set,lyric,camera_hardware,caiman)
|
||||||
|
|
|
@ -69,8 +69,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
|
||||||
include device/google/gs-common/pixelsupport/pixelsupport.mk
|
include device/google/gs-common/pixelsupport/pixelsupport.mk
|
||||||
|
|
||||||
# Increment the SVN for any official public releases
|
# Increment the SVN for any official public releases
|
||||||
|
ifdef RELEASE_SVN_KOMODO
|
||||||
|
TARGET_SVN ?= $(RELEASE_SVN_KOMODO)
|
||||||
|
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,komodo)
|
$(call soong_config_set,lyric,camera_hardware,komodo)
|
||||||
|
|
|
@ -59,8 +59,15 @@ include device/google/gs-common/modem/radio_ext/radio_ext.mk
|
||||||
include device/google/gs-common/pixelsupport/pixelsupport.mk
|
include device/google/gs-common/pixelsupport/pixelsupport.mk
|
||||||
|
|
||||||
# Increment the SVN for any official public releases
|
# Increment the SVN for any official public releases
|
||||||
|
ifdef RELEASE_SVN_TOKAY
|
||||||
|
TARGET_SVN ?= $(RELEASE_SVN_TOKAY)
|
||||||
|
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,tokay)
|
$(call soong_config_set,lyric,camera_hardware,tokay)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue