From 5831db30891244ebdf9658e502080517a7d5030d Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 22 Feb 2019 13:35:52 -0800
Subject: [PATCH] Build quest demo apk on Jenkins

---
 android/apps/questInterface/build.gradle |  19 +++++++------
 android/apps/questInterface/keystore.jks | Bin 0 -> 2223 bytes
 android/build_android.sh                 |  33 ++++++++++++++++++-----
 android/containerized_build.sh           |   2 ++
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 android/apps/questInterface/keystore.jks

diff --git a/android/apps/questInterface/build.gradle b/android/apps/questInterface/build.gradle
index 3d13877607..bf600b5df1 100644
--- a/android/apps/questInterface/build.gradle
+++ b/android/apps/questInterface/build.gradle
@@ -44,10 +44,15 @@ android {
         }
         signingConfigs {
             release {
-                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 : ''
+                // Hack for Quest demo
+                storeFile file("keystore.jks")
+                storePassword "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"
-            }
-        }
     }
 }
 
diff --git a/android/apps/questInterface/keystore.jks b/android/apps/questInterface/keystore.jks
new file mode 100644
index 0000000000000000000000000000000000000000..4b646122f6f20c60a69d27f15590bc69a757ef60
GIT binary patch
literal 2223
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
KB59rbJmw!9zT}$#

literal 0
HcmV?d00001

diff --git a/android/build_android.sh b/android/build_android.sh
index a066332f9a..106a295750 100755
--- a/android/build_android.sh
+++ b/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}
 
diff --git a/android/containerized_build.sh b/android/containerized_build.sh
index 8b2f26cb50..34e620ad2e 100755
--- a/android/containerized_build.sh
+++ b/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"