From 50cd4b00dcea439fbee8745485d6f18bea4f8a4c Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Fri, 19 Sep 2014 13:52:57 -0700 Subject: [PATCH] Bug 1065773 - Post: Add release signed Robocop APK to mochitest/ in tests package. r=mshal This isn't strictly necessary, but if we start fishing these APKs from the tests package, we can phase out the buildbot and mozharness logic that handles robocop.apk specially. --- testing/mochitest/Makefile.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in index e802e2dd1079..1d3dd403d901 100644 --- a/testing/mochitest/Makefile.in +++ b/testing/mochitest/Makefile.in @@ -92,6 +92,20 @@ DIST_BIN = $(DIST)/bin $(_DEST_DIR): $(NSINSTALL) -D $@ +# On Android only, include a release signed Robocop APK in the test package. +ifeq ($(MOZ_BUILD_APP),mobile/android) +JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar +include $(topsrcdir)/config/android-common.mk + +stage-package-android: + $(NSINSTALL) -D $(_DEST_DIR) + $(call RELEASE_SIGN_ANDROID_APK,\ + $(DEPTH)/build/mobile/robocop/robocop-debug-unsigned-unaligned.apk,\ + $(_DEST_DIR)/robocop.apk) + +stage-package: stage-package-android +endif + stage-package: $(NSINSTALL) -D $(PKG_STAGE)/mochitest && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins && $(NSINSTALL) -D $(DIST)/plugins && $(NSINSTALL) -D $(PKG_STAGE)/bin/plugins/gmp-fake/1.0 cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/mochitest