ifneq ($(TARGET_UNIFIED_DEVICE),)
$(INTERNAL_OTA_PACKAGE_TARGET): override_prop := --override_prop=true
+ ifeq ($(TARGET_OTA_ASSERT_DEVICE),)
+ $(INTERNAL_OTA_PACKAGE_TARGET): override_device := $(TARGET_DEVICE)
+ endif
endif
$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE)
oem_props = info_dict.get("oem_fingerprint_properties")
if oem_props is None or len(oem_props) == 0:
if OPTIONS.override_device == "auto":
- if OPTIONS.override_prop:
- device = GetBuildProp("ro.build.product", info_dict)
- else:
- device = GetBuildProp("ro.product.device", info_dict)
+ device = GetBuildProp("ro.product.device", info_dict)
else:
device = OPTIONS.override_device
script.AssertDevice(device)
oem_dict = common.LoadDictionaryFromLines(
open(OPTIONS.oem_source).readlines())
- metadata = {
- "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
- OPTIONS.source_info_dict),
- "ota-type": "FILE",
- }
+ if OPTIONS.override_prop:
+ metadata = {
+ "ota-type": "FILE",
+ }
+ else:
+ metadata = {
+ "pre-device": GetOemProperty("ro.product.device", oem_props, oem_dict,
+ OPTIONS.source_info_dict),
+ "ota-type": "FILE",
+ }
post_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.target_info_dict)
pre_timestamp = GetBuildProp("ro.build.date.utc", OPTIONS.source_info_dict)