commit da0701854dd22628a5f9af900535fe6acb763bcc
author Kelvin Zhang <zhangkelvin@google.com> Fri Sep 02 17:34:37 2022 +0000
committer Kelvin Zhang <zhangkelvin@google.com> Fri Sep 02 19:41:13 2022 +0000
tree 0b3d605847bc8cc6112243a03b6ae824683771cf
parent 862c46c9eec1220a629eb14254e5a12c6da17825

Skip writing empty SPL string into update manifest

If field is empty, no need to waste space storing it in protobuf.

Test: generate OTA, make sure SPL field is unset
Bug: 244525514
Change-Id: I43630efaf7c082541af786657110c345c4f6ee17

payload_generator/payload_file.cc

diff --git a/payload_generator/payload_file.cc b/payload_generator/payload_file.cc
index 0ef747a..f404c79 100644
--- a/payload_generator/payload_file.cc
+++ b/payload_generator/payload_file.cc
@@ -66,7 +66,9 @@
   manifest_.set_minor_version(config.version.minor);
   manifest_.set_block_size(config.block_size);
   manifest_.set_max_timestamp(config.max_timestamp);
-  manifest_.set_security_patch_level(config.security_patch_level);
+  if (!config.security_patch_level.empty()) {
+    manifest_.set_security_patch_level(config.security_patch_level);
+  }
 
   if (config.target.dynamic_partition_metadata != nullptr)
     *(manifest_.mutable_dynamic_partition_metadata()) =