diff options
author | Dan Albert <danalbert@google.com> | 2018-08-30 11:34:27 -0700 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2018-08-30 11:37:25 -0700 |
commit | 622f06695746244e9f82b17e5ad56fb16716ea60 (patch) | |
tree | 5f0cae5cd376718a6769b24bff047e108ee839d5 /checkbuild.py | |
parent | 31a860014cc856b495e6600c86ea82e2b6d0972f (diff) | |
download | ndk-622f06695746244e9f82b17e5ad56fb16716ea60.tar.gz |
Add support for disabling a module.
This doesn't make it unbuildable, but will not build the module
unless it is explicitly named (or depended upon). This gives us a way
to add module definitions for things that we don't necessarily want
to ship yet, but are useful for local testing.
Test: Disable gdbserver, `./checkbuild.py`, see it not in the list,
`./checkbuild.py gdbserver`, see that it is.
Bug: None
Change-Id: Ie87dbdc575db2ee27d8c21e677658531a824479b
Diffstat (limited to 'checkbuild.py')
-rwxr-xr-x | checkbuild.py | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/checkbuild.py b/checkbuild.py index 437255041..222a3d1a3 100755 --- a/checkbuild.py +++ b/checkbuild.py @@ -1922,7 +1922,7 @@ NAMES_TO_MODULES = {m.name: m for m in ALL_MODULES} def get_all_module_names(): - return [m.name for m in ALL_MODULES] + return [m.name for m in ALL_MODULES if m.enabled] def build_number_arg(value): @@ -1990,10 +1990,6 @@ def parse_args(): '--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_known_args() @@ -2070,18 +2066,6 @@ def main(): if not module_names: module_names = get_all_module_names() - if args.host_only: - module_names = [ - 'clang', - 'gcc', - 'host-tools', - 'ndk-build', - 'python-packages', - 'renderscript-toolchain', - 'shader-tools', - 'simpleperf', - ] - required_package_modules = set(get_all_module_names()) have_required_modules = required_package_modules <= set(module_names) do_package = have_required_modules if args.package else False |