Fix module include/exclude priority logic. (#991)

Command line include modules should have higher
priority than default exclude modules.

Fixes #924.

IoT.js-DCO-1.0-Signed-off-by: Zoltan Herczeg [email protected]

Author: zherczeg

tools/module_analyzer.py

@@ -39,19 +39,21 @@ def resolve_modules(options):
         build_modules_excludes |= set(
             options.config['module']['exclude'][system_os])
 
+    # Build options has higher priority than defaults
+    build_modules_excludes -= options.iotjs_include_module
+
     # By default the target included modules are:
     #  - always module set from the build config
     #  - modules specified by the command line argument
-    include_modules = set()
-    include_modules |= build_modules_always
+    include_modules = set() | build_modules_always
     include_modules |= options.iotjs_include_module
 
     if not options.iotjs_minimal_profile:
         # Add the include set from the build config to
         # the target include modules set
         include_modules |= build_modules_includes
 
-    # Check if there is any modules which are not allowed to be excluded
+    # Check if there are any modules which are not allowed to be excluded
     impossible_to_exclude = options.iotjs_exclude_module & build_modules_always
     if impossible_to_exclude:
         ex.fail('Cannot exclude modules which are always enabled: %s' %