Merge "build: Fix Version in releasetools" into n7.1

CyanogenMod · Jun 15, 2017 · d35a6cf · d35a6cf
2 parents 357c26d + ad0c34a
commit d35a6cf
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
@@ -723,12 +723,10 @@ def WriteFullOTAPackage(input_zip, output_zip):
   script.Print("*********************************************");
 
 
-  aicpv = GetBuildProp("ro.aicp.version", OPTIONS.info_dict)
+  build = GetBuildProp("ro.aicp.version", OPTIONS.info_dict)
   if os.getenv("AICP_BUILDTYPE") is not None:
-    build = ' '.join(aicpv.split('_')[3].split('-')).title()
     script.Print("*   Version: %s"%(build));
   elif os.getenv("AICP_NIGHTLY") is not None:
-    build = ' '.join(aicpv.split('_')[2:]).title()
     script.Print("*   Version: %s"%(build));
   else:
     build = GetBuildProp("ro.build.date", OPTIONS.info_dict)