From 11a8a39f6d2e057d51559c52c1bf0ba74bbfe189 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 1 Mar 2018 14:26:41 -0500 Subject: Use MOZ_FENNEC and MOZ_XULRUNNER instead of checking MOZ_BUILD_APP in most places --- toolkit/mozapps/installer/package-name.mk | 2 +- toolkit/mozapps/installer/upload-files-APK.mk | 2 +- toolkit/mozapps/webextensions/moz.build | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'toolkit/mozapps') diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk index a2caff914..d88975f36 100644 --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -22,7 +22,7 @@ endif ifndef MOZ_PKG_PLATFORM MOZ_PKG_PLATFORM := $(TARGET_OS)-$(TARGET_CPU) -ifeq ($(MOZ_BUILD_APP),mobile/android) +ifdef MOZ_FENNEC MOZ_PKG_PLATFORM := android-$(TARGET_CPU) endif diff --git a/toolkit/mozapps/installer/upload-files-APK.mk b/toolkit/mozapps/installer/upload-files-APK.mk index 9bb5b2e18..f9bfd6735 100644 --- a/toolkit/mozapps/installer/upload-files-APK.mk +++ b/toolkit/mozapps/installer/upload-files-APK.mk @@ -23,7 +23,7 @@ GECKO_APP_AP_PATH = $(topobjdir)/mobile/android/base ifdef ENABLE_TESTS INNER_ROBOCOP_PACKAGE=true -ifeq ($(MOZ_BUILD_APP),mobile/android) +ifdef MOZ_FENNEC UPLOAD_EXTRA_FILES += robocop.apk # Robocop/Robotium tests, Android Background tests, and Fennec need to diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build index 12640e115..b92915ae8 100644 --- a/toolkit/mozapps/webextensions/moz.build +++ b/toolkit/mozapps/webextensions/moz.build @@ -6,9 +6,6 @@ SPHINX_TREES['addon-manager'] = 'docs' -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - DIRS += ['internal'] TEST_DIRS += ['test'] -- cgit v1.2.3