partition_tools: Remove references to partition guid.

Bug: 117229984
Test: builds with PRODUCT_USE_LOGICAL_PARTITIONS=true
Change-Id: Ibba49f7a066fd190f8431253302f1437f07ba6dd

2 files changed, 7 insertions, 9 deletions

diff --git a/partition_tools/lpdump.cc b/partition_tools/lpdump.cc
index bab05bb8..0dc347e0 100644
--- a/partition_tools/lpdump.cc
+++ b/partition_tools/lpdump.cc
@@ -101,11 +101,9 @@ int main(int argc, char* argv[]) {
 
     for (const auto& partition : pt->partitions) {
         std::string name = GetPartitionName(partition);
-        std::string guid = GetPartitionGuid(partition);
         std::string group_name = GetPartitionGroupName(pt->groups[partition.group_index]);
         printf("  Name: %s\n", name.c_str());
         printf("  Group: %s\n", group_name.c_str());
-        printf("  GUID: %s\n", guid.c_str());
         printf("  Attributes: %s\n", BuildAttributeString(partition.attributes).c_str());
         printf("  Extents:\n");
         uint64_t first_sector = 0;
diff --git a/partition_tools/lpmake.cc b/partition_tools/lpmake.cc
index caa12a3f..a78301d2 100644
--- a/partition_tools/lpmake.cc
+++ b/partition_tools/lpmake.cc
@@ -56,7 +56,7 @@ static int usage(int /* argc */, char* argv[]) {
             "                                maximum size.\n"
             "\n"
             "Partition data format:\n"
-            "  <name>:<guid>:<attributes>:<size>\n"
+            "  <name>:<attributes>:<size>[:group]\n"
             "  Attrs must be 'none' or 'readonly'.\n",
             argv[0], argv[0]);
     return EX_USAGE;
@@ -229,7 +229,7 @@ int main(int argc, char* argv[]) {
 
     for (const auto& partition_info : partitions) {
         std::vector<std::string> parts = android::base::Split(partition_info, ":");
-        if (parts.size() > 5) {
+        if (parts.size() > 4) {
             fprintf(stderr, "Partition info has invalid formatting.\n");
             return EX_USAGE;
         }
@@ -241,13 +241,13 @@ int main(int argc, char* argv[]) {
         }
 
         uint64_t size;
-        if (!android::base::ParseUint(parts[3].c_str(), &size)) {
+        if (!android::base::ParseUint(parts[2].c_str(), &size)) {
             fprintf(stderr, "Partition must have a valid size.\n");
             return EX_USAGE;
         }
 
         uint32_t attribute_flags = 0;
-        std::string attributes = parts[2];
+        std::string attributes = parts[1];
         if (attributes == "readonly") {
             attribute_flags |= LP_PARTITION_ATTR_READONLY;
         } else if (attributes != "none") {
@@ -256,11 +256,11 @@ int main(int argc, char* argv[]) {
         }
 
         std::string group_name = "default";
-        if (parts.size() >= 5) {
-            group_name = parts[4];
+        if (parts.size() >= 4) {
+            group_name = parts[3];
         }
 
-        Partition* partition = builder->AddPartition(name, group_name, parts[1], attribute_flags);
+        Partition* partition = builder->AddPartition(name, group_name, attribute_flags);
         if (!partition) {
             fprintf(stderr, "Could not add partition: %s\n", name.c_str());
             return EX_SOFTWARE;