Make --module optional.
Test: ./checkbuild.py
Test: ./checkbuild.py ndk-build
Test: ./checkbuild.py --module ndk-build
Test: ./checkbuild.py ndk-build --module clang
Bug: None
Change-Id: Ic235aea94b0faa717c58643cea918d89b1750205
diff --git a/checkbuild.py b/checkbuild.py
index 49299a5..b5daae6 100755
--- a/checkbuild.py
+++ b/checkbuild.py
@@ -1558,14 +1558,14 @@
module_group = parser.add_mutually_exclusive_group()
module_group.add_argument(
- '--module', dest='modules', action='append',
+ '--module', dest='modules', action='append', default=[],
choices=get_all_module_names(), help='NDK modules to build.')
module_group.add_argument(
'--host-only', action='store_true',
help='Skip building target components.')
- return parser.parse_args()
+ return parser.parse_known_args()
def log_build_failure(log_path, dist_dir):
@@ -1620,12 +1620,10 @@
total_timer = ndk.timer.Timer()
total_timer.start()
- args = parse_args()
-
- if args.modules is None:
+ args, module_names = parse_args()
+ module_names.extend(args.modules)
+ if not module_names:
module_names = get_all_module_names()
- else:
- module_names = args.modules
if args.host_only:
module_names = [