Working on fixing build problems

android/docker/Dockerfile

@@ -52,11 +52,14 @@ ENV PATH ${PATH}:${ANDROID_NDK_HOME}
 RUN apt-get -y install \
     g++ \
     gcc \
+    sudo \
+    emacs-nox \
     -
 
 # --- Gradle
 ARG BUILD_UID=1001
 RUN useradd -ms /bin/bash -u $BUILD_UID jenkins
+RUN echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 USER jenkins
 WORKDIR /home/jenkins
 
@@ -71,22 +74,21 @@ RUN mkdir "$HIFI_BASE" && \
 
 RUN git clone https://github.com/jherico/hifi.git && \
     cd ~/hifi && \
-    git checkout feature/build/gradle-wrapper 
-
+    git checkout feature/quest_move_interface
 
 WORKDIR /home/jenkins/hifi
 
-RUN touch .test4 && \ 
-    git fetch && git reset origin/feature/build/gradle-wrapper --hard
+RUN touch .test6 && \ 
+    git fetch && git reset origin/feature/quest_move_interface --hard
 
 RUN mkdir build
 
 # Pre-cache the vcpkg managed dependencies
 WORKDIR /home/jenkins/hifi/build
-RUN python3 ../prebuild.py --build-root `pwd` --android
+RUN python3 ../prebuild.py --build-root `pwd` --android interface
 
 # Pre-cache the gradle dependencies
 WORKDIR /home/jenkins/hifi/android
 RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
-RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED 
+#RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED 
 

hifi_android.py

@@ -222,7 +222,7 @@ class QtPackager:
                     if (relativeFilename.startswith('qml')):
                         continue
                     filename = os.path.join(self.qtRootPath, relativeFilename)
-                    self.files.extend(hifi_utils.recursiveFileList(filename))
+                    self.files.extend(hifi_utils.recursiveFileList(filename, excludeNamePattern=r"^\."))
                 elif item.tag == 'jar' and 'bundling' in item.attrib and item.attrib['bundling'] == "1":
                     self.files.append(os.path.join(self.qtRootPath, item.attrib['file']))
                 elif item.tag == 'permission':
@@ -247,7 +247,6 @@ class QtPackager:
         qmlImportResults = json.loads(commandResult)
         for item in qmlImportResults:
             if 'path' not in item:
-                print("Warning: QML import could not be resolved in any of the import paths: {}".format(item['name']))
                 continue
             path = os.path.realpath(item['path'])
             if not os.path.exists(path):
@@ -258,7 +257,7 @@ class QtPackager:
             basePath = os.path.normcase(basePath)
             if basePath.startswith(qmlRootPath):
                 continue
-            self.files.extend(hifi_utils.recursiveFileList(path))
+            self.files.extend(hifi_utils.recursiveFileList(path, excludeNamePattern=r"^\."))
 
     def processFiles(self):
         self.files = list(set(self.files))
@@ -271,7 +270,7 @@ class QtPackager:
         for sourceFile in self.files:
             if not os.path.isfile(sourceFile):
                 raise RuntimeError("Unable to find dependency file " + sourceFile)
-            relativePath = os.path.relpath(sourceFile, self.qtRootPath)
+            relativePath = os.path.relpath(sourceFile, self.qtRootPath).replace('\\', '/')
             destinationFile = None
             if relativePath.endswith('.so'):
                 garbledFileName = None
@@ -284,7 +283,7 @@ class QtPackager:
                     libName = m.group(1)
                     ET.SubElement(qtLibsNode, 'item').text = libName
                 else:
-                    garbledFileName = 'lib' + relativePath.replace('\\', '_'[0])
+                    garbledFileName = 'lib' + relativePath.replace('/', '_'[0])
                     value = "{}:{}".format(garbledFileName, relativePath).replace('\\', '/')
                     ET.SubElement(bundledLibsNode, 'item').text = value
                 destinationFile = os.path.join(self.jniPath, garbledFileName)
@@ -337,6 +336,7 @@ class QtPackager:
 
     def bundle(self):
         if not os.path.isfile(self.xmlFile):
+            print("Bundling Qt info into {}".format(self.xmlFile))
             self.copyQtDeps()
             self.scanQmlImports()
             self.processFiles()

hifi_utils.py

@@ -6,6 +6,7 @@ import ssl
 import subprocess
 import sys
 import tarfile
+import re
 import urllib
 import urllib.request
 import zipfile
@@ -23,13 +24,15 @@ def scriptRelative(*paths):
     return result
 
 
-def recursiveFileList(startPath):
+def recursiveFileList(startPath, excludeNamePattern=None ):
     result = []
     if os.path.isfile(startPath):
         result.append(startPath)
     elif os.path.isdir(startPath):
         for dirName, subdirList, fileList in os.walk(startPath):
             for fname in fileList:
+                if excludeNamePattern and re.match(excludeNamePattern, fname):
+                    continue
                 result.append(os.path.realpath(os.path.join(startPath, dirName, fname)))
     result.sort()
     return result

hifi_vcpkg.py

@@ -85,7 +85,7 @@ endif()
 
         if self.args.android:
             self.triplet = 'arm64-android'
-            self.androidPackagePath = os.path.join(self.path, 'android')
+            self.androidPackagePath = os.getenv('HIFI_ANDROID_PRECOMPILED', os.path.join(self.path, 'android'))
         else:
             self.triplet = self.hostTriplet
 
@@ -216,7 +216,7 @@ endif()
         if not self.args.android:
             cmakeTemplate += VcpkgRepo.CMAKE_TEMPLATE_NON_ANDROID
         else:
-            precompiled = os.path.realpath(os.path.join(self.path, 'android'))
+            precompiled = os.path.realpath(self.androidPackagePath)
             qtCmakePrefix = os.path.realpath(os.path.join(precompiled, 'qt/lib/cmake'))
             cmakeTemplate += 'set(HIFI_ANDROID_PRECOMPILED "{}")\n'.format(precompiled)
             cmakeTemplate += 'set(QT_CMAKE_PREFIX_PATH "{}")\n'.format(qtCmakePrefix)