Bug 1065773 - Post: Add release signed Robocop APK to mochitest/ in tests package. r=mshal
authorNick Alexander <nalexander@mozilla.com>
Fri, 19 Sep 2014 13:52:57 -0700
changeset 206292 3a8b8b81aeb943e906fd79c52091008f2007469c
parent 206291 319f56b07340952556455c744bee9b808c900d21
child 206293 8edf69df721b074893dfb873071a47f24788e4f4
push id27522
push userttaubert@mozilla.com
push dateSat, 20 Sep 2014 15:16:48 +0000
treeherdermozilla-central@5bd6e09f074e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1065773
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -87,16 +87,30 @@ GMP_TEST_FILES := \
 
 # Rules for staging the necessary harness bits for a test package
 PKG_STAGE = $(DIST)/test-stage
 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
 	(cd $(DEPTH)/_tests/testing && tar $(TAR_CREATE_FLAGS) - mochitest) | (cd $(PKG_STAGE) && tar -xf -)
 	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/mochitest
 	@(cd $(DIST_BIN) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_BINS)) | (cd $(PKG_STAGE)/bin && tar -xf -)
 	@(cd $(DIST_BIN)/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)
 	(cd $(topsrcdir)/build/pgo && tar $(TAR_CREATE_FLAGS) - certs) | (cd $(PKG_STAGE) && tar -xf -)