Add whitelist for version resolver

If DEPS entry has condition we only care about linux_checkout,
however we need also some files for andorid, add white list to
keep the checkouts to minimum.

Upadate black listed submodules.

Task-number: QTBUG-83459
Change-Id: Id6f744dd52880a2f43c5fc3655837612c82d2f6e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

3 files changed, 14 insertions, 21 deletions

diff --git a/tools/scripts/cipd_package.py b/tools/scripts/cipd_package.py
index a9dfce91e..8ab448c86 100644
--- a/tools/scripts/cipd_package.py
+++ b/tools/scripts/cipd_package.py
@@ -38,7 +38,7 @@ class PackageDEPSParser(resolver.DEPSParser):
                 entities.append(entity)
         return entities
 
-    def parse(self, deps_content):
+    def parse(self, deps_content, module_whitelist = []):
         exec(deps_content, self.global_scope, self.local_scope)
         entities = []
         entities.extend(self.createEntitiesFromScope(self.local_scope['deps']))
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py
index b2c21de27..89af8aa41 100644
--- a/tools/scripts/git_submodule.py
+++ b/tools/scripts/git_submodule.py
@@ -31,7 +31,7 @@ class SubmoduleDEPSParser(resolver.DEPSParser):
         #result.update(self.custom_vars or {})
         return result
 
-    def createSubmodulesFromScope(self, scope, os):
+    def createSubmodulesFromScope(self, scope, os, module_whitelist = []):
         submodules = []
         for dep in scope:
             url = ''
@@ -39,10 +39,11 @@ class SubmoduleDEPSParser(resolver.DEPSParser):
                 url = scope[dep]
             elif (type(scope[dep]) == dict and 'url' in scope[dep]):
                 url = scope[dep]['url']
+
                 if ('condition' in scope[dep]) and \
                 (not 'checkout_linux' in scope[dep]['condition']) and \
-                (not 'checkout_android_native_support' in scope[dep]['condition']):
-                    url = ''
+                (not dep in module_whitelist):
+                    continue
             if url:
                 url = url.format(**self.get_vars())
                 repo_rev = url.split('@')
@@ -67,11 +68,11 @@ class SubmoduleDEPSParser(resolver.DEPSParser):
                 submodules.append(submodule)
         return submodules
 
-    def parse(self, deps_content):
+    def parse(self, deps_content, module_whitelist = []):
         exec(deps_content, self.global_scope, self.local_scope)
 
         submodules = []
-        submodules.extend(self.createSubmodulesFromScope(self.local_scope['deps'], 'all'))
+        submodules.extend(self.createSubmodulesFromScope(self.local_scope['deps'], 'all', module_whitelist))
         if 'deps_os' in self.local_scope:
             for os_dep in self.local_scope['deps_os']:
                 submodules.extend(self.createSubmodulesFromScope(self.local_scope['deps_os'][os_dep], os_dep))
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 99b4d2869..9dd60b477 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -54,20 +54,12 @@ snapshot_src_dir = os.path.abspath(os.path.join(qtwebengine_root, 'src/3rdparty'
 upstream_src_dir = os.path.abspath(snapshot_src_dir + '_upstream')
 
 submodule_blacklist = [
-    'third_party/WebKit/LayoutTests/w3c/csswg-test'
-    , 'third_party/WebKit/LayoutTests/w3c/web-platform-tests'
-    , 'chrome/tools/test/reference_build/chrome_mac'
-    , 'chrome/tools/test/reference_build/chrome_linux'
-    , 'chrome/tools/test/reference_build/chrome_win'
-   # buildtools duplicates:
-    , 'buildtools/clang_format/script'
-    , 'buildtools/linux64'
-    , 'buildtools/mac'
-    , 'buildtools/win'
-    , 'buildtools/third_party/libc++/trunk'
-    , 'buildtools/third_party/libc++abi/trunk'
-    , 'buildtools/third_party/libunwind/trunk'
-    ]
+  'buildtools/clang_format/script',
+  'buildtools/third_party/libc++/trunk',
+  'buildtools/third_party/libc++abi/trunk',
+  'buildtools/third_party/libunwind/trunk'
+]
+submodule_whitelist = [ 'src/third_party/android_ndk' , 'src/third_party/libunwindstack' ]
 
 sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts'))
 
@@ -94,7 +86,7 @@ def read(parserCls):
     git_deps = subprocess.check_output(['git', 'show', chromium_version +':DEPS'])
 
     parser = parserCls()
-    git_submodules = parser.parse(git_deps)
+    git_submodules = parser.parse(git_deps, submodule_whitelist)
 
     submodule_dict = {}