commit 3632f30b8fd24ad67510deaebddd64e973349157
author Alex Humesky <ahumesky@google.com> Thu Jan 26 23:05:28 2017 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Fri Jan 27 10:12:41 2017 +0000
tree 6c9513b12c5685f7118c2ace5128c9802c6d4460
parent 942e3c7a70eca041c468e6615e444bc889668452

Fix build_split_manifest.py to not include the versionCode or versionName
attributes if they aren't present in the original manifest. Before, it would make them None, and aapt would fail.

--
PiperOrigin-RevId: 145726642
MOS_MIGRATED_REVID=145726642

tools/android/build_split_manifest.py

diff --git a/tools/android/build_split_manifest.py b/tools/android/build_split_manifest.py
index 84c1f1e..c791e3a 100644
--- a/tools/android/build_split_manifest.py
+++ b/tools/android/build_split_manifest.py
@@ -42,8 +42,8 @@
 MANIFEST_TEMPLATE = """<?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="%(version_code)s"
-    android:versionName="%(version_name)s"
+    %(version_code_attribute)s
+    %(version_name_attribute)s
     package="%(package)s"
     split="%(split)s">
   <application android:hasCode="%(hascode)s">
@@ -80,8 +80,10 @@
   version_name = manifest.get(android_namespace_prefix + "versionName")
 
   return MANIFEST_TEMPLATE % {
-      "version_code": version_code,
-      "version_name": version_name,
+      "version_code_attribute":
+          'android:versionCode="%s"' % version_code if version_code else "",
+      "version_name_attribute":
+          'android:versionName="%s"' % version_name if version_name else "",
       "package": package,
       "split": split,
       "hascode": str(hascode).lower()