diff options
| author | Jooyung Han <jooyung@google.com> | 2019-11-12 13:03:50 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2019-12-09 11:27:46 +0900 |
| commit | 2426fc9136badefd667aafc05043ace14f08e470 (patch) | |
| tree | b9ef51b6def24a71b6d6bf8fe424371f8bedf1b1 /apexer/apexer.py | |
| parent | ce0cd0e8fca006e7ed92644706faf5029a069361 (diff) | |
apexer: remove apex_manifest_full.json
apex_manifest_full.json was only for debugging purpose and is equavalent
to apex_manifest.pb.
Bug: 143951586
Test: m nothing (soong tests)
Test: m com.android.apex.cts.shim.v1
Test: m com.android.conscrypt (any Q-launching apex)
&& deapexer list <apex> shows apex_manifest.json also
Change-Id: I9f59b92e9c10aeb3844db4091ee090b21f4976dd
Diffstat (limited to 'apexer/apexer.py')
| -rw-r--r-- | apexer/apexer.py | 10 |
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: |