commit fe263b2505fe71584149874ee8a441149676bd9a
author Yi Kong <yikong@google.com> Tue Feb 06 19:10:39 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 06 19:10:39 2018 +0000
tree 558a3d937f8575a498291e29a6b71b5234deeaf6
parent d6f72efe5dc2c5cd592e80ede5c7d94d2a3c41e3
parent 440257ca4e71e717ed01bfa45412b5a244ca0bd4

Ignore -Wpragma-pack warning am: 09d403257e am: b0730c9755
am: 440257ca4e

Change-Id: I63935dfbb126c4b1da36d7ab40d311e7481104ff

gptcl.cc

diff --git a/gptcl.cc b/gptcl.cc
index 9834788..f80db25 100644
--- a/gptcl.cc
+++ b/gptcl.cc
@@ -364,6 +364,8 @@
                   if (partNum < 0)
                      partNum = newPartNum;
                   if ((partNum >= 0) && (partNum < (int) GetNumParts())) {
+                     // Remember the original hex value requested
+                     typeRaw[partNum] = GetString(typeCode, 2);
                      typeHelper = GetString(typeCode, 2);
                      if ((typeHelper != (GUIDData) "00000000-0000-0000-0000-000000000000") &&
                          (ChangePartType(partNum, typeHelper))) {
@@ -494,6 +496,14 @@
                                    operator[](origPartNum).GetLengthLBA());
                newPart.SetStatus(0);
                newPart.SetType((uint8_t)(operator[](origPartNum).GetHexType() / 0x0100));
+               // If we were created with a specific hex type, use that instead
+               // of risking fidelity loss by doing a GUID-based lookup
+               if (typeRaw.count(origPartNum) == 1) {
+                  string raw = typeRaw[origPartNum];
+                  if (raw.size() == 4) {
+                     newPart.SetType(StrToHex(raw, 0));
+                  }
+               }
                newMBR.AddPart(i + isHybrid, newPart);
             } else {
                cerr << "Original partition " << origPartNum + 1 << " does not exist or is too big! Aborting operation!\n";

gptcl.h

diff --git a/gptcl.h b/gptcl.h
index 610ca5f..7484a49 100644
--- a/gptcl.h
+++ b/gptcl.h
@@ -24,6 +24,7 @@
 
 #include "gpt.h"
 #include <popt.h>
+#include <map>
 
 using namespace std;
 
@@ -36,6 +37,7 @@
       int alignment, deletePartNum, infoPartNum, largestPartNum, bsdPartNum;
       uint32_t tableSize;
       poptContext poptCon;
+      std::map<int, string> typeRaw;
 
       int BuildMBR(char* argument, int isHybrid);
    public: