diff options
| author | Pete Gillin <peteg@google.com> | 2020-01-21 13:41:49 +0000 |
|---|---|---|
| committer | Pete Gillin <peteg@google.com> | 2020-01-21 13:44:43 +0000 |
| commit | 581cab8f14d922dfca9770927d94d554a0f2e361 (patch) | |
| tree | 5a4926a6db95769371d6239c5ea57a6ca94dd1d2 /apexer/apexer.py | |
| parent | 2d4cf7db160ba0809459a3efdb07572ce82e05e7 (diff) | |
Revert "Pass in min-sdk-version to apexer."
This reverts commit 2d4cf7db160ba0809459a3efdb07572ce82e05e7.
Reason for revert: Caused vendor/google/build/build_mainline_modules.sh to fail with `Error: minSdkVersion (10000) is greater than maxSdkVersion (30)`.
Bug: 130541924
Change-Id: I4be2a9e8e6e5d7606a465a85a28ce5af415213c4
Diffstat (limited to 'apexer/apexer.py')
| -rw-r--r-- | apexer/apexer.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/apexer/apexer.py b/apexer/apexer.py index 7e523ab..cbb5a49 100644 --- a/apexer/apexer.py +++ b/apexer/apexer.py @@ -115,10 +115,6 @@ def ParseArgs(argv): required=False, help='Default target SDK version to use for AndroidManifest.xml') parser.add_argument( - '--min_sdk_version', - required=False, - help='Default Min SDK version to use for AndroidManifest.xml') - parser.add_argument( '--do_not_check_keyname', required=False, action='store_true', @@ -493,13 +489,10 @@ def CreateApex(args, work_dir): cmd.extend(['--version-name', manifest_apex.versionName]) if args.target_sdk_version: cmd.extend(['--target-sdk-version', args.target_sdk_version]) - if args.min_sdk_version: - cmd.extend(['--min-sdk-version', args.min_sdk_version]) - else: - # Default value for minSdkVersion. - cmd.extend(['--min-sdk-version', '29']) if args.assets_dir: cmd.extend(['-A', args.assets_dir]) + # Default value for minSdkVersion. + cmd.extend(['--min-sdk-version', '29']) cmd.extend(['-o', apk_file]) cmd.extend(['-I', args.android_jar_path]) RunCommand(cmd, args.verbose) |