summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps/installer
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-23 15:56:35 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-23 15:56:35 -0400
commit325b204d2661dafd2720d3e78f47be8038871dbd (patch)
treef649c7aa92e1d49aba43de6ebade282a8bd3da28 /toolkit/mozapps/installer
parentabe80cc31d5a40ebed743085011fbcda0c1a9a10 (diff)
downloadUXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar
UXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar.gz
UXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar.lz
UXP-325b204d2661dafd2720d3e78f47be8038871dbd.tar.xz
UXP-325b204d2661dafd2720d3e78f47be8038871dbd.zip
Issue #1053 - Drop support Android and remove Fennec - Part 1b: Remove MOZ_FENNEC
Diffstat (limited to 'toolkit/mozapps/installer')
-rw-r--r--toolkit/mozapps/installer/package-name.mk4
-rw-r--r--toolkit/mozapps/installer/upload-files-APK.mk15
2 files changed, 0 insertions, 19 deletions
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index 1a8728088..680590b3c 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -30,10 +30,6 @@ endif
ifndef MOZ_PKG_PLATFORM
MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU)
-ifdef MOZ_FENNEC
-MOZ_PKG_PLATFORM := android-$(TARGET_CPU)
-endif
-
# TARGET_OS/TARGET_CPU may be unintuitive, so we hardcode some special formats
ifeq ($(OS_ARCH),WINNT)
ifeq ($(TARGET_CPU),x86_64)
diff --git a/toolkit/mozapps/installer/upload-files-APK.mk b/toolkit/mozapps/installer/upload-files-APK.mk
index f9bfd6735..bf2fa4f9f 100644
--- a/toolkit/mozapps/installer/upload-files-APK.mk
+++ b/toolkit/mozapps/installer/upload-files-APK.mk
@@ -23,21 +23,6 @@ GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base
ifdef ENABLE_TESTS
INNER_ROBOCOP_PACKAGE=true
-ifdef MOZ_FENNEC
-UPLOAD_EXTRA_FILES += robocop.apk
-
-# Robocop/Robotium tests, Android Background tests, and Fennec need to
-# be signed with the same key, which means release signing them all.
-
-ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
-robocop_apk := $(topobjdir)/mobile/android/tests/browser/robocop/robocop-debug-unsigned-unaligned.apk
-else
-robocop_apk := $(topobjdir)/gradle/build/mobile/android/app/outputs/apk/app-automation-debug-androidTest-unaligned.apk
-endif
-
-INNER_ROBOCOP_PACKAGE= \
- $(call RELEASE_SIGN_ANDROID_APK,$(robocop_apk),$(ABS_DIST)/robocop.apk)
-endif
else
INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Android Robocop for you'
endif