summaryrefslogtreecommitdiff
path: root/apexer/apexer.py
diff options
context:
space:
mode:
authorGavin Corkery <gavincorkery@google.com>2019-04-30 10:40:12 +0100
committerGavin Corkery <gavincorkery@google.com>2019-05-01 09:43:19 +0100
commit9463856c5223a9881ce93de5efd5c4368131ebf5 (patch)
tree0c3554989692741996ec5b7fcf286cfb467e5e32 /apexer/apexer.py
parent45b283dcd56e427ea9116f39bef908fc5a32254d (diff)
Add versionName field to APEX manifest.
The source of truth for an APEX version name is the manifest.json file, which is propagated via aapt to the AndroidManifest.xml. Test: adb shell cmd apexservice getAllPackages Test: Add versionName field to an apex manifest.json, make and then run aapt dump badging to the path of the output. Bug: 118739827 Change-Id: I4648237847d06d69016a72b620d5c8588d852c69
Diffstat (limited to 'apexer/apexer.py')
-rw-r--r--apexer/apexer.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py
index 1869a29..35a3f8e 100644
--- a/apexer/apexer.py
+++ b/apexer/apexer.py
@@ -356,6 +356,8 @@ def CreateApex(args, work_dir):
# This version from apex_manifest.json is used when versionCode isn't
# specified in AndroidManifest.xml
cmd.extend(['--version-code', str(manifest_apex.version)])
+ if manifest_apex.versionName:
+ cmd.extend(['--version-name', manifest_apex.versionName])
if args.target_sdk_version:
cmd.extend(['--target-sdk-version', args.target_sdk_version])
# Default value for minSdkVersion.