Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-15 14:30:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1065773 - Part 2: Stop release signing instrumentation test APKs at package time. r=mshal

Browse Source
This commit is contained in:
Nick Alexander 2014-09-19 13:52:55 -07:00
parent 1d426f4614
commit 6fabb8b5e0
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolkit/mozapps/installer/packager.mk
View File

@ -336,7 +336,6 @@ GECKO_APP_AP_PATH = $(abspath $(DEPTH)/mobile/android/base)
ifdef ENABLE_TESTS
INNER_ROBOCOP_PACKAGE=echo
INNER_BACKGROUND_TESTS_PACKAGE=echo
ifeq ($(MOZ_BUILD_APP),mobile/android)
UPLOAD_EXTRA_FILES += robocop.apk
UPLOAD_EXTRA_FILES += fennec_ids.txt
@ -354,19 +353,9 @@ ROBOCOP_PATH = $(abspath $(_ABS_DIST)/../build/mobile/robocop)
INNER_ROBOCOP_PACKAGE= \
cp $(GECKO_APP_AP_PATH)/fennec_ids.txt $(_ABS_DIST) && \
$(call RELEASE_SIGN_ANDROID_APK,$(ROBOCOP_PATH)/robocop-debug-unsigned-unaligned.apk,$(_ABS_DIST)/robocop.apk)
BACKGROUND_TESTS_PATH = $(abspath $(_ABS_DIST)/../mobile/android/tests/background/junit3)
INNER_BACKGROUND_TESTS_PACKAGE= \
$(call RELEASE_SIGN_ANDROID_APK,$(BACKGROUND_TESTS_PATH)/background-junit3-debug-unsigned-unaligned.apk,$(_ABS_DIST)/background-junit3.apk)
BROWSER_TESTS_PATH = $(abspath $(_ABS_DIST)/../mobile/android/tests/browser/junit3)
INNER_BROWSER_TESTS_PACKAGE= \
$(call RELEASE_SIGN_ANDROID_APK,$(BROWSER_TESTS_PATH)/browser-junit3-debug-unsigned-unaligned.apk,$(_ABS_DIST)/browser-junit3.apk)
endif
else
INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you'
INNER_BACKGROUND_TESTS_PACKAGE=echo 'Testing is disabled - No Android Background JUnit 3 tests for you'
INNER_BROWSER_TESTS_PACKAGE=echo 'Testing is disabled - No Android Browser JUnit 3tests for you'
endif
# Create geckoview_library/geckoview_{assets,library}.zip for third-party GeckoView consumers.
@ -460,8 +449,6 @@ INNER_MAKE_PACKAGE = \
$(RELEASE_JARSIGNER) $(_ABS_DIST)/gecko.apk && \
$(ZIPALIGN) -f -v 4 $(_ABS_DIST)/gecko.apk $(PACKAGE) && \
$(INNER_ROBOCOP_PACKAGE) && \
$(INNER_BACKGROUND_TESTS_PACKAGE) && \
$(INNER_BROWSER_TESTS_PACKAGE) && \
$(INNER_MAKE_GECKOVIEW_LIBRARY) && \
$(INNER_MAKE_GECKOVIEW_EXAMPLE)