Merge cherrypicks of ['googleplex-android-review.googlesource.com/27030093'] into sparse-12192237-L48700030005686605.

SPARSE_CHANGE: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d

Change-Id: I88c3fb94518d5f1c5ac51b1cc12f14ddada0dac0
This commit is contained in:
Android Build Coastguard Worker 2024-08-08 05:05:49 +00:00
commit 0f2f894c41
2 changed files with 36 additions and 0 deletions

View file

@ -405,6 +405,24 @@ endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=$(TARGET_SVN) ro.vendor.build.svn=$(TARGET_SVN)
# Set device family property for SMR
PRODUCT_PROPERTY_OVERRIDES += \
ro.build.device_family=HK3SB3AK3
# Set build properties for SMR builds
ifeq ($(RELEASE_IS_SMR), true)
ifneq (,$(RELEASE_BASE_OS_HUSKY))
PRODUCT_BASE_OS := $(RELEASE_BASE_OS_HUSKY)
endif
endif
# Set build properties for EMR builds
ifeq ($(RELEASE_IS_EMR), true)
ifneq (,$(RELEASE_BASE_OS_HUSKY))
PRODUCT_PROPERTY_OVERRIDES += \
ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_HUSKY)
endif
endif
# WLC userdebug specific # WLC userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

View file

@ -382,6 +382,24 @@ endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=$(TARGET_SVN) ro.vendor.build.svn=$(TARGET_SVN)
# Set device family property for SMR
PRODUCT_PROPERTY_OVERRIDES += \
ro.build.device_family=HK3SB3AK3
# Set build properties for SMR builds
ifeq ($(RELEASE_IS_SMR), true)
ifneq (,$(RELEASE_BASE_OS_SHIBA))
PRODUCT_BASE_OS := $(RELEASE_BASE_OS_SHIBA)
endif
endif
# Set build properties for EMR builds
ifeq ($(RELEASE_IS_EMR), true)
ifneq (,$(RELEASE_BASE_OS_SHIBA))
PRODUCT_PROPERTY_OVERRIDES += \
ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_SHIBA)
endif
endif
# P23 Devices no longer need rlsservice # P23 Devices no longer need rlsservice
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.rls_supported=false persist.vendor.camera.rls_supported=false