diff options
| author | Abhijeet Kaur <abkaur@google.com> | 2019-01-02 16:50:21 +0000 |
|---|---|---|
| committer | Abhijeet Kaur <abkaur@google.com> | 2019-01-02 17:00:49 +0000 |
| commit | c4b218303aead411852fe39afba916c387db6e9e (patch) | |
| tree | 054b0333a7de000818342a605f3ce69e6250c5a7 /apexer/apexer.py | |
| parent | 4620b2d4af8f7b88802380dffe08d8bc839ec039 (diff) | |
apexer: Move to proto object and remove ApexManifest class
Remove ApexManifest class and use proto object directly.
Add postInstallHook field in proto message schema as it is present in
apexd.
Bug: 116129963
Test: ./apexer/runtests.sh
Change-Id: Iaca472c942c1546ff74761d450155530d446447d
Diffstat (limited to 'apexer/apexer.py')
| -rw-r--r-- | apexer/apexer.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py index 3e36e01..6da23e6 100644 --- a/apexer/apexer.py +++ b/apexer/apexer.py @@ -205,8 +205,8 @@ def CreateApex(args, work_dir): if args.payload_type == 'image': key_name = os.path.basename(os.path.splitext(args.key)[0]) - if manifest_apex.package_name != key_name: - print("package name '" + manifest_apex.package_name + "' does not match with key name '" + key_name + "'") + if manifest_apex.name != key_name: + print("package name '" + manifest_apex.name + "' does not match with key name '" + key_name + "'") return False img_file = os.path.join(content_dir, 'apex_payload.img') @@ -298,7 +298,7 @@ def CreateApex(args, work_dir): if args.verbose: print('Creating AndroidManifest ' + android_manifest_file) with open(android_manifest_file, 'w+') as f: - f.write(PrepareAndroidManifest(manifest_apex.package_name, manifest_apex.version_number)) + f.write(PrepareAndroidManifest(manifest_apex.name, manifest_apex.version)) # copy manifest to the content dir so that it is also accessible # without mounting the image |