summaryrefslogtreecommitdiff
path: root/apexer/apexer.py
diff options
context:
space:
mode:
authorDario Freni <dariofreni@google.com>2020-01-23 10:03:25 +0000
committerDario Freni <dariofreni@google.com>2020-01-30 10:22:44 +0000
commit3601ea49f5cc24aebacee1ed7d49a91241f9153c (patch)
tree9f06e9e5a0c41eeca9444c5af78d427b99fbf132 /apexer/apexer.py
parentbb86bd7643c46d82e8da3424581b90b27a09ad9c (diff)
Add min sdk, target sdk and no_hashtree to build_info.
Bug: 147691496 Test: atest --host apexer_test (in later CL) Change-Id: I8b369810e05e3d0416e0eb9cb1e1d3bf8dd18de2
Diffstat (limited to 'apexer/apexer.py')
-rw-r--r--apexer/apexer.py24
1 files changed, 24 insertions, 0 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py
index 7e523ab..de6e0be 100644
--- a/apexer/apexer.py
+++ b/apexer/apexer.py
@@ -286,6 +286,21 @@ def ValidateArgs(args):
print('Missing ----canned_fs_config {config} argument, or a --build_info argument!')
return False
+ if not args.target_sdk_version:
+ if build_info is not None:
+ if build_info.target_sdk_version:
+ args.target_sdk_version = build_info.target_sdk_version
+
+ if not args.no_hashtree:
+ if build_info is not None:
+ if build_info.no_hashtree:
+ args.no_hashtree = True
+
+ if not args.min_sdk_version:
+ if build_info is not None:
+ if build_info.min_sdk_version:
+ args.min_sdk_version = build_info.min_sdk_version
+
return True
def GenerateBuildInfo(args):
@@ -302,6 +317,15 @@ def GenerateBuildInfo(args):
with open(args.android_manifest) as f:
build_info.android_manifest = f.read()
+ if args.target_sdk_version:
+ build_info.target_sdk_version = args.target_sdk_version
+
+ if args.min_sdk_version:
+ build_info.min_sdk_version = args.min_sdk_version
+
+ if args.no_hashtree:
+ build_info.no_hashtree = True
+
return build_info
def CreateApex(args, work_dir):