Merge branch 'quest-demo' of https://github.com/highfidelity/hifi into quest-demo

android/apps/questInterface/build.gradle

@@ -44,10 +44,15 @@ android {
         }
         signingConfigs {
             release {
-                storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
+                // Hack for Quest demo
-                storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
+                storeFile file("keystore.jks")
-                keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
+                storePassword "password"
-                keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
+                keyAlias "key0"
+                keyPassword "password"
+                // storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
+                // storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
+                // keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
+                // keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
                 v2SigningEnabled false
             }
         }
@@ -133,12 +138,6 @@ android {
                 assetList.each { file -> out.println(file) }
             }
         }
-
-        variant.outputs.all {
-            if (RELEASE_NUMBER != '0') {
-                outputFileName = "app_" + RELEASE_NUMBER + "_" + RELEASE_TYPE + ".apk"
-            }
-        }
     }
 }
 

android/build_android.sh

@@ -1,11 +1,32 @@
 #!/usr/bin/env bash
 set -xeuo pipefail
+
+ANDROID_BUILD_TYPE=release
+ANDROID_BUILD_TARGET=assembleRelease
+
+case "$RELEASE_TYPE" in
+    PR) ANDROID_APK_SUFFIX=PR${RELEASE_NUMBER}-${SHA7}.apk ;;
+    *) ANDROID_APK_SUFFIX=${RELEASE_NUMBER}-${SHA7}.apk	;;
+esac
+
+
+# Interface build
+ANDROID_APP=interface
+ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE}
+ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}-unsigned.apk
+ANDROID_APK_NAME=HighFidelity-Beta-${ANDROID_APK_SUFFIX}
 ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET}
+cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}
+
+# Quest Interface build
+ANDROID_APP=questInterface
+ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE}
+ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk
+ANDROID_APK_NAME=HighFidelity-Quest-Beta-${ANDROID_APK_SUFFIX}
+./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET}
+cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}
+
+
+
 
-# This is the actual output from gradle, which no longer attempts to muck with the naming of the APK
-OUTPUT_APK=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_DIR}/${ANDROID_BUILT_APK_NAME}
-# This is the APK name requested by Jenkins
-TARGET_APK=./${ANDROID_APK_NAME}
-# Make sure this matches up with the new ARTIFACT_EXPRESSION for jenkins builds, which should be "android/*.apk"
-cp ${OUTPUT_APK} ${TARGET_APK}
 

android/containerized_build.sh

@@ -9,6 +9,7 @@ docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f docker/D
 # So make sure we use VERSION_CODE consistently
 test -z "$VERSION_CODE" && export VERSION_CODE=$VERSION
 
+# FIXME figure out which of these actually need to be forwarded and which can be eliminated
 docker run \
    --rm \
    --security-opt seccomp:unconfined \
@@ -27,6 +28,7 @@ docker run \
    -e OAUTH_CLIENT_SECRET \
    -e OAUTH_CLIENT_ID \
    -e OAUTH_REDIRECT_URI \
+   -e SHA7 \
    -e VERSION_CODE \
    "${DOCKER_IMAGE_NAME}" \
    sh -c "./build_android.sh"