diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-03-01 14:26:41 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-03-01 14:26:41 -0500 |
| commit | 11a8a39f6d2e057d51559c52c1bf0ba74bbfe189 (patch) | |
| tree | 06ace3e2923e6ca0fafe4453dac5988c54387eb6 /toolkit/mozapps | |
| parent | 17e72c824ed54ced83a2943237340f8d1b7b1824 (diff) | |
| download | UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar.gz UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar.lz UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.tar.xz UXP-11a8a39f6d2e057d51559c52c1bf0ba74bbfe189.zip | |
Use MOZ_FENNEC and MOZ_XULRUNNER instead of checking MOZ_BUILD_APP in most places
Diffstat (limited to 'toolkit/mozapps')
| -rw-r--r-- | toolkit/mozapps/installer/package-name.mk | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/upload-files-APK.mk | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/webextensions/moz.build | 3 |
3 files changed, 2 insertions, 5 deletions
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'] |