android: If keystore password is not present, produce unsigned apk

This makes sure untrusted builds in doozer (PRs, etc) don't fail
Buksa · Mar 20, 2018 · b269949 · b269949
1 parent b81d305
commit b269949
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/arch/android/android.mk b/src/arch/android/android.mk
@@ -21,7 +21,7 @@ ${BUILDDIR}/src/arch/android/%.o : CFLAGS = ${OPTFLAGS} \
  -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations \
  -Wno-multichar -std=gnu99
 
-.DEFAULT_GOAL := ${BUILDDIR}/${APPNAME}.aligned.apk
+.DEFAULT_GOAL := ${BUILDDIR}/${APPNAME}.apk
 
 
 MANIFEST := ${BUILDDIR}/AndroidManifest.xml
@@ -87,9 +87,9 @@ ${BUILDDIR}/${APPNAME}.aligned.apk: ${BUILDDIR}/${APPNAME}.unsigned.apk
  ${ZIPALIGN} -f -p 4 $< $@
 
 ${BUILDDIR}/${APPNAME}.apk: ${BUILDDIR}/${APPNAME}.aligned.apk
- ${APKSIGNER} sign -ks android/movian.keystore -ks-pass env:MOVIAN_KEYSTORE_PASS --out $@ $<
+ @[ -z "$$MOVIAN_KEYSTORE_PASS" ] && (cp $< $@ ; echo "Warning: Keystore password not present, producing unsigned APK") || (${APKSIGNER} sign -ks android/movian.keystore -ks-pass env:MOVIAN_KEYSTORE_PASS --out $@ $< ; echo "APK signed")
 
-signed-apk: ${BUILDDIR}/${APPNAME}.apk
+apk: ${BUILDDIR}/${APPNAME}.apk
  @echo "doozer-artifact:${BUILDDIR}/${APPNAME}.apk:apk:application/vnd.android.package-archive:${APPNAME}_api${ANDROID_MIN_SDK_VERSION}_${ANDROID_ABI}.apk:versioncode=${NUMVER}"
 
 install: ${BUILDDIR}/${APPNAME}.apk