diff --git a/configure.in b/configure.in index 36fb3ce0f5b1..76570897d894 100644 --- a/configure.in +++ b/configure.in @@ -3833,6 +3833,7 @@ MOZ_ANDROID_BEAM= MOZ_LOCALE_SWITCHER= MOZ_ANDROID_SEARCH_ACTIVITY= MOZ_ANDROID_MLS_STUMBLER= +MOZ_ANDROID_SHARE_OVERLAY= ACCESSIBILITY=1 MOZ_TIME_MANAGER= MOZ_PAY= @@ -4855,6 +4856,13 @@ if test -n "$MOZ_ANDROID_MLS_STUMBLER"; then AC_DEFINE(MOZ_ANDROID_MLS_STUMBLER) fi +dnl ======================================================== +dnl = Include share overlay on Android +dnl ======================================================== +if test -n "$MOZ_ANDROID_SHARE_OVERLAY"; then + AC_DEFINE(MOZ_ANDROID_SHARE_OVERLAY) +fi + dnl ======================================================== dnl = Enable IPDL's "expensive" unit tests dnl ======================================================== @@ -8447,6 +8455,7 @@ AC_SUBST(MOZ_ANDROID_BEAM) AC_SUBST(MOZ_LOCALE_SWITCHER) AC_SUBST(MOZ_DISABLE_GECKOVIEW) AC_SUBST(MOZ_ANDROID_SEARCH_ACTIVITY) +AC_SUBST(MOZ_ANDROID_SHARE_OVERLAY) AC_SUBST(MOZ_ANDROID_MLS_STUMBLER) AC_SUBST(ENABLE_STRIP) AC_SUBST(PKG_SKIP_STRIP) diff --git a/mobile/android/base/locales/moz.build b/mobile/android/base/locales/moz.build index 6721a9538b17..704da121638f 100644 --- a/mobile/android/base/locales/moz.build +++ b/mobile/android/base/locales/moz.build @@ -6,3 +6,6 @@ if CONFIG['MOZ_ANDROID_SEARCH_ACTIVITY']: DEFINES['MOZ_ANDROID_SEARCH_ACTIVITY'] = 1 + +if CONFIG['MOZ_ANDROID_SHARE_OVERLAY']: + DEFINES['MOZ_ANDROID_SHARE_OVERLAY'] = 1 diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build index 9921e96c9aef..bd7a2c333ccc 100644 --- a/mobile/android/base/moz.build +++ b/mobile/android/base/moz.build @@ -587,7 +587,8 @@ ANDROID_GENERATED_RESFILES += [ ] for var in ('MOZ_ANDROID_ANR_REPORTER', 'MOZ_LINKER_EXTRACT', 'MOZILLA_OFFICIAL', 'MOZ_DEBUG', - 'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER'): + 'MOZ_ANDROID_SEARCH_ACTIVITY', 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_MLS_STUMBLER', + 'MOZ_ANDROID_SHARE_OVERLAY'): if CONFIG[var]: DEFINES[var] = 1 diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index 515a6339fa2b..f7746f551773 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -81,5 +81,8 @@ else MOZ_ANDROID_SEARCH_ACTIVITY= fi +# Don't enable the share overlay. +# MOZ_ANDROID_SHARE_OVERLAY=1 + # Don't enable the Mozilla Location Service stumbler. # MOZ_ANDROID_MLS_STUMBLER=1