summaryrefslogtreecommitdiff
path: root/apexer/apexer.py
diff options
context:
space:
mode:
Diffstat (limited to 'apexer/apexer.py')
-rw-r--r--apexer/apexer.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py
index 890a2d2..6c30f31 100644
--- a/apexer/apexer.py
+++ b/apexer/apexer.py
@@ -48,11 +48,9 @@ def ParseArgs(argv):
help='path to the APEX manifest file (.pb)')
parser.add_argument(
'--manifest_json',
+ required=False,
help='path to the APEX manifest file (Q compatible .json)')
parser.add_argument(
- '--manifest_json_full',
- help='path to the APEX manifest file (.json)')
- parser.add_argument(
'--android_manifest',
help='path to the AndroidManifest file. If omitted, a default one is created and used'
)
@@ -195,7 +193,7 @@ def ValidateAndroidManifest(package, android_manifest):
if package_in_xml != package:
raise Exception("Package name '" + package_in_xml + "' in '" +
android_manifest + " differ from package name '" + package +
- "' in the apex_manifest.json")
+ "' in the apex_manifest.pb")
def ValidateArgs(args):
@@ -411,10 +409,6 @@ def CreateApex(args, work_dir):
copyfile(args.manifest, os.path.join(content_dir, 'apex_manifest.pb'))
if args.manifest_json:
copyfile(args.manifest_json, os.path.join(content_dir, 'apex_manifest.json'))
- if args.manifest_json_full:
- copyfile(args.manifest_json_full, os.path.join(content_dir, 'apex_manifest_full.json'))
- elif args.manifest_json_full:
- copyfile(args.manifest_json_full, os.path.join(content_dir, 'apex_manifest.json'))
# copy the public key, if specified
if args.pubkey: