From 0992fec1c5f27658ee0992d4be7d5dab1aef7f33 Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Wed, 10 Feb 2016 15:47:45 -0800 Subject: [PATCH] Bug 1247470 - Don't try to sign bouncer APK during Android single locale repacks. r=glandium There's no slick way to determine that we're doing a single local repack, and it's not worth adding a new flag just for this situation. So let's not sign the bouncer APK if tests are disabled; since tests are disabled during single local repack packaging, this should be sufficient. This makes the bouncer APK just like the Robocop APK. MozReview-Commit-ID: AaHUEMhcqMy --HG-- extra : rebase_source : e386c139613f7bfc83b4e7a28e905a6489171c5a --- toolkit/mozapps/installer/upload-files.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 80a661f5b09c..b992ddfc3575 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -315,7 +315,7 @@ DIST_FILES += $(MOZ_CHILD_PROCESS_NAME) GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base ifdef ENABLE_TESTS -INNER_ROBOCOP_PACKAGE=echo +INNER_ROBOCOP_PACKAGE=true ifeq ($(MOZ_BUILD_APP),mobile/android) UPLOAD_EXTRA_FILES += robocop.apk UPLOAD_EXTRA_FILES += fennec_ids.txt @@ -343,6 +343,8 @@ INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you' endif ifdef MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER +INNER_INSTALL_BOUNCER_PACKAGE=true +ifdef ENABLE_TESTS UPLOAD_EXTRA_FILES += bouncer.apk bouncer_package=$(ABS_DIST)/bouncer.apk @@ -360,6 +362,9 @@ INNER_INSTALL_BOUNCER_PACKAGE=\ diff -c $(PACKAGE).permissions $(bouncer_package).permissions || \ (echo "*** Error: The permissions of the bouncer package differ from the permissions of the main package. Ensure the bouncer and main package Android manifests agree, rebuild mobile/android, and re-package." && exit 1)) else +INNER_INSTALL_BOUNCER_PACKAGE=echo 'Testing is disabled, so the install bouncer is disabled - No trampolines for you' +endif # ENABLE_TESTS +else INNER_INSTALL_BOUNCER_PACKAGE=echo 'Install bouncer is disabled - No trampolines for you' endif # MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER