Bug 1443246 - Don't sign Robocop APK during stage-package. r=gbrown
authorNick Alexander <nalexander@mozilla.com>
Mon, 05 Mar 2018 11:20:16 -0800
changeset 406602 6ad76fb895952634047b366b896cf9d74ab06b9f
parent 406601 c0b2aa2dc564deaa6a3783d22855030a35fd6a0c
child 406603 07e72c13b47641264629490a28894c6007fabe9d
push id33571
push usercsabou@mozilla.com
push dateTue, 06 Mar 2018 02:49:43 +0000
treeherdermozilla-central@36c84344de23 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1443246
milestone60.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 1443246 - Don't sign Robocop APK during stage-package. r=gbrown MozReview-Commit-ID: FWIrGbHqt4J
testing/mochitest/Makefile.in
testing/testsuite-targets.mk
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -12,21 +12,8 @@ include $(topsrcdir)/config/rules.mk
 TARGET_DEPTH = ../../..
 include $(topsrcdir)/build/automation-build.mk
 
 libs:: 
 	(cd $(DIST)/xpi-stage && tar $(TAR_CREATE_FLAGS) - mochijar) | (cd $(_DEST_DIR) && tar -xf -)
 
 $(_DEST_DIR):
 	$(NSINSTALL) -D $@
-
-# On Android only, include a release signed Robocop APK in the test package.
-ifeq ($(MOZ_BUILD_APP),mobile/android)
-include $(topsrcdir)/config/android-common.mk
-
-robocop_apk := $(GRADLE_ANDROID_APP_ANDROIDTEST_APK)
-
-stage-package-android:
-	$(NSINSTALL) -D $(_DEST_DIR)
-	$(call RELEASE_SIGN_ANDROID_APK,$(robocop_apk),$(_DEST_DIR)/robocop.apk)
-
-stage-package: stage-package-android
-endif
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -178,20 +178,17 @@ stage-config: make-stage-dir
 	$(NSINSTALL) -D $(PKG_STAGE)/config
 	@(cd $(topsrcdir)/testing/config && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/config && tar -xf -)
 
 stage-mach: make-stage-dir
 	@(cd $(topsrcdir)/python/mach && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/tools/mach && tar -xf -)
 	cp $(topsrcdir)/testing/tools/mach_test_package_bootstrap.py $(PKG_STAGE)/tools/mach_bootstrap.py
 	cp $(topsrcdir)/mach $(PKG_STAGE)
 
-stage-mochitest: make-stage-dir
-ifeq ($(MOZ_BUILD_APP),mobile/android)
-	$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
-endif
+stage-mochitest: make-stage-dir ;
 
 stage-jstests: make-stage-dir
 	$(MAKE) -C $(DEPTH)/js/src/tests stage-package
 
 ifdef OBJCOPY
 ifneq ($(OBJCOPY), :) # see build/autoconf/toolchain.m4:102 for why this is necessary
 ifndef PKG_SKIP_STRIP
 STRIP_COMPILED_TESTS := 1