[coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L48700030005686605 into 24Q3-release.

COASTGUARD_SKIP: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d
COASTGUARD_SKIP: I88c3fb94518d5f1c5ac51b1cc12f14ddada0dac0

Change-Id: Ie625895170513d5737b557afce67eb66af62d711

device-husky.mk

diff --git a/device-husky.mk b/device-husky.mk
index ba387c9..f1aec80 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -405,24 +405,6 @@
 PRODUCT_VENDOR_PROPERTIES += \
     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
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
     PRODUCT_COPY_FILES += \

device-shiba.mk

diff --git a/device-shiba.mk b/device-shiba.mk
index 04a51b0..eadaa37 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -382,24 +382,6 @@
 PRODUCT_VENDOR_PROPERTIES += \
     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
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.rls_supported=false