Merge "ldrp-v2: Change to handle descrepancy between tools usage"

linux-ramdump-parser-v2/debug_image_v2.py

@@ -335,9 +335,13 @@ class DebugImage_v2():
         qtf_dir = os.path.join(out_dir, 'qtf')
         workspace = os.path.join(qtf_dir, 'qtf.workspace')
         qtf_out = os.path.join(out_dir, 'qtf.txt')
-        chipset = 'msm' + str(ram_dump.hw_id)
+        chipset = 'msm' + ram_dump.hw_id
         hlos = 'LA'
 
+        #Temp change to handle descripancy between tools usage
+        if chipset == 'msmcobalt':
+            chipset = 'msm8998'
+
         # Resolve any port collisions with other running qtf_server instances
         for tries in range(max_tries):
             port = random.randint(12000, 13000)