From b61bd7a5031a0b22f26848c7ff7f8982e04d7022 Mon Sep 17 00:00:00 2001 From: Margareta Eliza Balazs Date: Wed, 17 Jan 2018 00:03:19 +0200 Subject: [PATCH] Backed out 7 changesets (bug 1419581) for B bustage on /builds/worker/workspace/build/src/widget/android/nsWindow.h:0 on a CLOSED TREE Backed out changeset 1af5a54e829d (bug 1419581) Backed out changeset c9aef37de282 (bug 1419581) Backed out changeset 8d0855cb17b7 (bug 1419581) Backed out changeset d0eba5853ab6 (bug 1419581) Backed out changeset bc4cda1cc57c (bug 1419581) Backed out changeset 93547276fba8 (bug 1419581) Backed out changeset 45b5309a73cb (bug 1419581) --- mobile/android/app/build.gradle | 2 - .../mozilla/gecko/push/TestPushManager.java | 2 +- mobile/android/base/AndroidManifest.xml.in | 6 +- mobile/android/base/AppConstants.java.in | 6 +- mobile/android/base/Makefile.in | 21 ++---- .../gecko/PresentationMediaPlayerManager.java | 2 - .../org/mozilla/gecko/mma/MmaDelegate.java | 6 ++ .../org/mozilla/gecko/mma/MmaInterface.java | 4 ++ .../org/mozilla/gecko/mma/MmaLeanplumImp.java | 12 +++- .../org/mozilla/gecko/mma/MmaStubImp.java | 10 +++ .../org/mozilla/gecko/push/PushManager.java | 13 +++- .../nightly-without-google-play-services | 12 ---- mobile/android/docs/mma.rst | 2 +- mobile/android/moz.configure | 64 ++++++------------- taskcluster/ci/build/android.yml | 49 -------------- .../64_api_16_without_google_play_services.py | 8 --- .../mozharness/mozilla/building/buildbase.py | 1 - widget/android/fennec/FennecJNINatives.h | 2 - widget/android/fennec/FennecJNIWrappers.cpp | 2 - widget/android/fennec/FennecJNIWrappers.h | 2 - widget/android/nsWindow.cpp | 8 --- widget/android/nsWindow.h | 2 - 22 files changed, 72 insertions(+), 164 deletions(-) delete mode 100644 mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services delete mode 100644 testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index fbecee7399be..6858c22b5b06 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -123,8 +123,6 @@ android { exclude 'org/mozilla/gecko/GeckoMediaPlayer.java' exclude 'org/mozilla/gecko/GeckoPresentationDisplay.java' exclude 'org/mozilla/gecko/MediaPlayerManager.java' - exclude 'org/mozilla/gecko/PresentationMediaPlayerManager.java' - exclude 'org/mozilla/gecko/RemotePresentationService.java' } if (mozconfig.substs.MOZ_INSTALL_TRACKING) { diff --git a/mobile/android/app/src/test/java/org/mozilla/gecko/push/TestPushManager.java b/mobile/android/app/src/test/java/org/mozilla/gecko/push/TestPushManager.java index 4be60e70beda..42ae0f543fa7 100644 --- a/mobile/android/app/src/test/java/org/mozilla/gecko/push/TestPushManager.java +++ b/mobile/android/app/src/test/java/org/mozilla/gecko/push/TestPushManager.java @@ -190,7 +190,7 @@ public class TestPushManager { public void testStartupBeforeConfiguration() throws Exception { verify(gcmTokenClient, never()).getToken(anyString(), anyBoolean()); manager.startup(System.currentTimeMillis()); - verify(gcmTokenClient, times(1)).getToken(AppConstants.MOZ_ANDROID_GCM_SENDERIDS, false); + verify(gcmTokenClient, times(1)).getToken(AppConstants.MOZ_ANDROID_GCM_SENDERID, false); } @Test diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index f1d1280484f5..8f1add6c14dd 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -43,13 +43,11 @@ -#ifdef MOZ_ANDROID_GOOGLE_PLAY_SERVICES +#ifdef MOZ_NATIVE_DEVICES -#endif - -#ifdef MOZ_NATIVE_DEVICES + #endif diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in index 34e483a6db77..02cc4a70981f 100644 --- a/mobile/android/base/AppConstants.java.in +++ b/mobile/android/base/AppConstants.java.in @@ -114,15 +114,11 @@ public class AppConstants { false; //#endif - public static final String MOZ_ANDROID_GCM_SENDERIDS = -//#ifdef MOZ_MMA_GCM_SENDERID - "@MOZ_ANDROID_GCM_SENDERID@,@MOZ_MMA_GCM_SENDERID@"; -//#else + public static final String MOZ_ANDROID_GCM_SENDERID = //#ifdef MOZ_ANDROID_GCM_SENDERID "@MOZ_ANDROID_GCM_SENDERID@"; //#else null; -//#endif //#endif public static final String MOZ_CHILD_PROCESS_NAME = "@MOZ_CHILD_PROCESS_NAME@"; diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index bfdaf4d8dfaa..a67f972aec12 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -54,15 +54,12 @@ JAVA_CLASSPATH += \ $(ANDROID_PALETTE_V7_AAR_LIB) \ $(NULL) -ifdef MOZ_ANDROID_GOOGLE_PLAY_SERVICES +# If native devices are enabled, add Google Play Services and some of the v7 +# compat libraries. +ifdef MOZ_NATIVE_DEVICES JAVA_CLASSPATH += \ $(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \ $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \ - $(NULL) -endif - -ifdef MOZ_NATIVE_DEVICES - JAVA_CLASSPATH += \ $(ANDROID_PLAY_SERVICES_CAST_AAR_LIB) \ $(ANDROID_MEDIAROUTER_V7_AAR_LIB) \ $(ANDROID_MEDIAROUTER_V7_AAR_INTERNAL_LIB) \ @@ -85,7 +82,7 @@ ifdef MOZ_INSTALL_TRACKING $(NULL) endif -# MOZ_ANDROID_MMA requires MOZ_ANDROID_GCM and MOZ_ANDROID_GOOGLE_PLAY_SERVICES, +# MOZ_ANDROID_MMA requires MOZ_ANDROID_GCM and MOZ_NATIVE_DEVICES, # which take care of the Play Services requirements in JAVA_CLASSPATH. # Based on the import of # `com.google.android.gms.ads.identifier.AdvertisingIdClient` in @@ -112,13 +109,6 @@ java_bundled_libs := \ $(ANDROID_PALETTE_V7_AAR_LIB) \ $(NULL) -ifdef MOZ_ANDROID_GOOGLE_PLAY_SERVICES - java_bundled_libs += \ - $(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \ - $(ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB) \ - $(NULL) -endif - ifdef MOZ_NATIVE_DEVICES java_bundled_libs += \ $(ANDROID_PLAY_SERVICES_BASE_AAR_LIB) \ @@ -145,7 +135,7 @@ ifdef MOZ_INSTALL_TRACKING $(NULL) endif -# MOZ_ANDROID_MMA requires MOZ_ANDROID_GCM and MOZ_ANDROID_GOOGLE_PLAY_SERVICES, +# MOZ_ANDROID_MMA requires MOZ_ANDROID_GCM and MOZ_NATIVE_DEVICES, # which take care of the Play Services requirements in # java_bundled_libs. See the note above. @@ -560,7 +550,6 @@ endif # @BuildFlag annotation in Java). For example, add a "MOZ_FOO \" line to this # list to support @BuildFlag(MOZ_FOO). BINDING_BUILD_FLAGS = \ - MOZ_NATIVE_DEVICES \ $(NULL) # Preprocess a JNI binding file using the build flags defined above. diff --git a/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java b/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java index 5daff8f9d284..46be429cd0b9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java +++ b/mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java @@ -20,13 +20,11 @@ import android.view.WindowManager; import org.mozilla.gecko.AppConstants.Versions; -import org.mozilla.gecko.annotation.BuildFlag; import org.mozilla.gecko.annotation.WrapForJNI; /** * A MediaPlayerManager with API 17+ Presentation support. */ -@BuildFlag("MOZ_NATIVE_DEVICES") @TargetApi(17) public class PresentationMediaPlayerManager extends MediaPlayerManager { diff --git a/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java b/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java index fd248df0dd61..1d203d183696 100644 --- a/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java @@ -25,6 +25,7 @@ import org.mozilla.gecko.Tab; import org.mozilla.gecko.Tabs; import org.mozilla.gecko.fxa.FirefoxAccounts; import org.mozilla.gecko.preferences.GeckoPreferences; +import org.mozilla.gecko.push.PushManager; import org.mozilla.gecko.switchboard.SwitchBoard; import org.mozilla.gecko.util.ContextUtils; @@ -74,6 +75,7 @@ public class MmaDelegate { // we gather the information here then pass to mmaHelper.init() // Note that generateUserAttribute always return a non null HashMap. final Map attributes = gatherUserAttributes(activity); + mmaHelper.setGcmSenderId(PushManager.getSenderIds()); final String deviceId = getDeviceId(activity); mmaHelper.setDeviceId(deviceId); PrefsHelper.setPref(GeckoPreferences.PREFS_MMA_DEVICE_ID, deviceId); @@ -159,6 +161,10 @@ public class MmaDelegate { } } + public static String getMmaSenderId() { + return mmaHelper.getMmaSenderId(); + } + private static String getDeviceId(Activity activity) { if (SwitchBoard.isInExperiment(activity, Experiments.LEANPLUM_DEBUG)) { return DEBUG_LEANPLUM_DEVICE_ID; diff --git a/mobile/android/base/java/org/mozilla/gecko/mma/MmaInterface.java b/mobile/android/base/java/org/mozilla/gecko/mma/MmaInterface.java index c5c20ade6090..317922f2fe71 100644 --- a/mobile/android/base/java/org/mozilla/gecko/mma/MmaInterface.java +++ b/mobile/android/base/java/org/mozilla/gecko/mma/MmaInterface.java @@ -20,6 +20,8 @@ public interface MmaInterface { void init(Activity Activity, Map attributes); + void setGcmSenderId(String senderIds); + void setCustomIcon(@DrawableRes int iconResId); void start(Context context); @@ -32,5 +34,7 @@ public interface MmaInterface { @CheckResult boolean handleGcmMessage(Context context, String from, Bundle bundle); + String getMmaSenderId(); + void setDeviceId(@NonNull String deviceId); } diff --git a/mobile/android/base/java/org/mozilla/gecko/mma/MmaLeanplumImp.java b/mobile/android/base/java/org/mozilla/gecko/mma/MmaLeanplumImp.java index 8da751b3c9b0..b7943f0bc528 100644 --- a/mobile/android/base/java/org/mozilla/gecko/mma/MmaLeanplumImp.java +++ b/mobile/android/base/java/org/mozilla/gecko/mma/MmaLeanplumImp.java @@ -46,8 +46,6 @@ public class MmaLeanplumImp implements MmaInterface { Leanplum.setAppIdForDevelopmentMode(MmaConstants.MOZ_LEANPLUM_SDK_CLIENTID, MmaConstants.MOZ_LEANPLUM_SDK_KEY); } - LeanplumPushService.setGcmSenderId(AppConstants.MOZ_ANDROID_GCM_SENDERIDS); - if (attributes != null) { Leanplum.start(activity, attributes); } else { @@ -71,6 +69,11 @@ public class MmaLeanplumImp implements MmaInterface { }); } + @Override + public void setGcmSenderId(String senderIds) { + LeanplumPushService.setGcmSenderId(senderIds); + } + @Override public void setCustomIcon(@DrawableRes final int iconResId) { LeanplumPushService.setCustomizer(new LeanplumPushNotificationCustomizer() { @@ -114,6 +117,11 @@ public class MmaLeanplumImp implements MmaInterface { return false; } + @Override + public String getMmaSenderId() { + return MmaConstants.MOZ_MMA_SENDER_ID; + } + @Override public void setDeviceId(@NonNull String deviceId) { Leanplum.setDeviceId(deviceId); diff --git a/mobile/android/base/java/org/mozilla/gecko/mma/MmaStubImp.java b/mobile/android/base/java/org/mozilla/gecko/mma/MmaStubImp.java index b84de3b9d386..fec85177f94c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/mma/MmaStubImp.java +++ b/mobile/android/base/java/org/mozilla/gecko/mma/MmaStubImp.java @@ -21,6 +21,11 @@ public class MmaStubImp implements MmaInterface { } + @Override + public void setGcmSenderId(String senderIds) { + + } + @Override public void setCustomIcon(@DrawableRes int iconResId) { @@ -51,6 +56,11 @@ public class MmaStubImp implements MmaInterface { return false; } + @Override + public String getMmaSenderId() { + return ""; + } + @Override public void setDeviceId(@NonNull String deviceId) { diff --git a/mobile/android/base/java/org/mozilla/gecko/push/PushManager.java b/mobile/android/base/java/org/mozilla/gecko/push/PushManager.java index 47b18e5d96d3..0522ac2b6139 100644 --- a/mobile/android/base/java/org/mozilla/gecko/push/PushManager.java +++ b/mobile/android/base/java/org/mozilla/gecko/push/PushManager.java @@ -57,6 +57,15 @@ public class PushManager { this.pushClientFactory = pushClientFactory; } + public static String getSenderIds() { + final String mmaSenderId = MmaDelegate.getMmaSenderId(); + if (mmaSenderId != null && mmaSenderId.length() > 0) { + return AppConstants.MOZ_ANDROID_GCM_SENDERID + "," + mmaSenderId; + } else { + return AppConstants.MOZ_ANDROID_GCM_SENDERID; + } + } + public PushRegistration registrationForSubscription(String chid) { // chids are globally unique, so we're not concerned about finding a chid associated to // any particular profile. @@ -244,7 +253,7 @@ public class PushManager { } protected @NonNull PushRegistration advanceRegistration(final PushRegistration registration, final @NonNull String profileName, final long now) throws AutopushClientException, PushClient.LocalException, GcmTokenClient.NeedsGooglePlayServicesException, IOException { - final Fetched gcmToken = gcmClient.getToken(AppConstants.MOZ_ANDROID_GCM_SENDERIDS, registration.debug); + final Fetched gcmToken = gcmClient.getToken(getSenderIds(), registration.debug); final PushClient pushClient = pushClientFactory.getPushClient(registration.autopushEndpoint, registration.debug); @@ -296,7 +305,7 @@ public class PushManager { public void startup(long now) { try { Log.i(LOG_TAG, "Startup: requesting GCM token."); - gcmClient.getToken(AppConstants.MOZ_ANDROID_GCM_SENDERIDS, false); // For side-effects. + gcmClient.getToken(getSenderIds(), false); // For side-effects. } catch (GcmTokenClient.NeedsGooglePlayServicesException e) { // Requires user intervention. At App startup, we don't want to address this. In // response to user activity, we do want to try to have the user address this. diff --git a/mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services b/mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services deleted file mode 100644 index 2d980f1f172c..000000000000 --- a/mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services +++ /dev/null @@ -1,12 +0,0 @@ -. "$topsrcdir/build/mozconfig.artifact.automation" - -. "$topsrcdir/mobile/android/config/mozconfigs/common" - -. "$topsrcdir/mobile/android/config/mozconfigs/android-api-16/nightly" - -ac_add_options --without-google-play-services - -unset MOZ_ANDROID_MMA -unset MOZ_ANDROID_POCKET - -. "$topsrcdir/mobile/android/config/mozconfigs/common.override" diff --git a/mobile/android/docs/mma.rst b/mobile/android/docs/mma.rst index b80b58099450..7f201f69a117 100644 --- a/mobile/android/docs/mma.rst +++ b/mobile/android/docs/mma.rst @@ -202,7 +202,7 @@ To test this locally, add lines like: export MOZ_ANDROID_MMA=1 ac_add_options --with-leanplum-sdk-keyfile=/path/to/leanplum-sdk-developer.token -MOZ_ANDROID_MMA depends on MOZ_ANDROID_GOOGLE_PLAY_SERVICES and MOZ_ANDROID_GCM. +MOZ_ANDROID_MMA depends on MOZ_NATIVE_DEVICES and MOZ_ANDROID_GCM. Since Leanplum requires Google Play Services library, those flags are a proxy for it, and enable respectively. We want to enable MOZ_ANDROID_MMA in Nightly, but only for diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure index 034810e966dc..11ee3a5f33af 100644 --- a/mobile/android/moz.configure +++ b/mobile/android/moz.configure @@ -8,41 +8,25 @@ project_flag('MOZ_ANDROID_EXCLUDE_FONTS', help='Whether to exclude font files from the build', default=True) -option('--with-google-play-services', - help='Enable features that depend on non-free Google Play Services', - default=True) - -@depends('--with-google-play-services') -def google_play_services(value): - return bool(value) - -set_config('MOZ_ANDROID_GOOGLE_PLAY_SERVICES', depends_if(google_play_services)(lambda _: True)) - -set_config('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0') -add_old_configure_assignment('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0') - -option(env='MOZ_ANDROID_GCM', - help='Enable GCM (Google Cloud Messaging) registration', - default=google_play_services) - -set_config('MOZ_ANDROID_GCM', - depends_if('MOZ_ANDROID_GCM')(lambda _: True)) -add_old_configure_assignment('MOZ_ANDROID_GCM', - depends_if('MOZ_ANDROID_GCM')(lambda _: True)) +project_flag('MOZ_ANDROID_GCM', + help='Enable GCM (Google Cloud Messaging) registration', + default=True, + set_for_old_configure=True) option(env='MOZ_NATIVE_DEVICES', help='Enable second screen support using native Android libraries.', - default=google_play_services) + default=True) set_config('MOZ_NATIVE_DEVICES', depends_if('MOZ_NATIVE_DEVICES')(lambda _: True)) add_old_configure_assignment('MOZ_NATIVE_DEVICES', depends_if('MOZ_NATIVE_DEVICES')(lambda _: True)) -# Enable install tracking SDK if we have Google Play support. -@depends(milestone, google_play_services, '--help') -def install_tracking_default(milestone, google_play_services, help): - return bool(milestone.is_release_or_beta and google_play_services) +# Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES +# is a proxy flag for that support. +@depends(milestone, 'MOZ_NATIVE_DEVICES', '--help') +def install_tracking_default(milestone, native_devices, help): + return bool(milestone.is_release_or_beta and native_devices) option(env='MOZ_INSTALL_TRACKING', help='Enable install tracking (currently using the Adjust SDK).', @@ -119,6 +103,9 @@ imply_option('--enable-small-chunk-size', True) set_config('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0') add_old_configure_assignment('ANDROID_SUPPORT_LIBRARY_VERSION', '23.4.0') +set_config('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0') +add_old_configure_assignment('ANDROID_GOOGLE_PLAY_SERVICES_VERSION', '8.4.0') + @depends(target) def check_target(target): if target.os != 'Android': @@ -133,13 +120,13 @@ include('../../build/moz.configure/java.configure') include('gradle.configure') # Must come after the ../../toolkit/moz.configure. -@depends('MOZ_INSTALL_TRACKING', google_play_services, '--with-adjust-sdk-keyfile') +@depends('MOZ_INSTALL_TRACKING', 'MOZ_NATIVE_DEVICES', '--with-adjust-sdk-keyfile') def check_install_tracking(install_tracking, - google_play_services, + native_devices, adjust_sdk_keyfile): if install_tracking: - if not google_play_services: - die('You must specify --with-google-play-services when' + if not native_devices: + die('You must specify MOZ_NATIVE_DEVICES=1 when' ' building with MOZ_INSTALL_TRACKING=1') if not adjust_sdk_keyfile: die('You must specify --with-adjust-sdk-keyfile=/path/to/keyfile when' @@ -147,16 +134,16 @@ def check_install_tracking(install_tracking, # Must come after the ../../toolkit/moz.configure. @depends('MOZ_ANDROID_MMA', - google_play_services, + 'MOZ_NATIVE_DEVICES', 'MOZ_ANDROID_GCM', '--with-leanplum-sdk-keyfile') def check_android_mma(android_mma, - google_play_services, + native_devices, android_gcm, leanplum_sdk_keyfile): if android_mma: - if not google_play_services: - die('You must specify --with-google-play-services when' + if not native_devices: + die('You must specify MOZ_NATIVE_DEVICES=1 when' ' building with MOZ_ANDROID_MMA=1') if not android_gcm: die('You must specify MOZ_ANDROID_GCM=1 when' @@ -171,12 +158,3 @@ def check_android_pocket(android_pocket, pocket_api_keyfile): if android_pocket and not pocket_api_keyfile: die('You must specify --with-pocket-api-keyfile=/path/to/keyfile when' ' building with MOZ_ANDROID_POCKET=1') - -# Must come after the ../../toolkit/moz.configure. -@depends('MOZ_ANDROID_GCM', google_play_services) -def check_android_gcm(android_gcm, - google_play_services): - if android_gcm: - if not google_play_services: - die('You must specify --with-google-play-services when' - ' building with MOZ_ANDROID_GCM=1') diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml index e1bd89ecd278..6be1f1f4f50b 100644 --- a/taskcluster/ci/build/android.yml +++ b/taskcluster/ci/build/android.yml @@ -202,55 +202,6 @@ android-api-16/opt: - linux64-sccache - proguard-jar -android-api-16-without-google-play-services/opt: - description: "Android 4.0 api-16+ (without Google Play Services) Opt" - index: - product: mobile - job-name: android-api-16-without-google-play-services-opt - treeherder: - platform: android-4-0-armv7-api16/opt - symbol: tc(BnoGPS) - worker-type: aws-provisioner-v1/gecko-{level}-b-android - worker: - docker-image: {in-tree: android-build} - max-run-time: 7200 - env: - GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline" - PERFHERDER_EXTRA_OPTIONS: android-api-16-without-google-play-services - TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest" - artifacts: - - name: public/android/R - path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R - type: directory - - name: public/android/maven - path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/ - type: directory - - name: public/build/geckoview_example.apk - path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/geckoview_example-withGeckoBinaries.apk - type: file - - name: public/build - path: /builds/worker/artifacts/ - type: directory - run: - using: mozharness - actions: [get-secrets build multi-l10n update] - config: - - builds/releng_base_android_64_builds.py - - disable_signing.py - - platform_supports_post_upload_to_latest.py - script: "mozharness/scripts/fx_desktop_build.py" - secrets: true - custom-build-variant-cfg: api-16-without-google-play-services - tooltool-downloads: internal - run-on-projects: ['mozilla-central'] - toolchains: - - android-gradle-dependencies - - android-sdk-linux - - linux64-clang - - linux64-rust-android - - linux64-sccache - - proguard-jar - android-api-16-nightly/opt: description: "Android 4.0 api-16+ Nightly" attributes: diff --git a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py b/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py deleted file mode 100644 index 5d385eb314fb..000000000000 --- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_16_without_google_play_services.py +++ /dev/null @@ -1,8 +0,0 @@ -config = { - 'base_name': 'Android armv7 api-16+ %(branch)s --without-google-play-services', - 'stage_platform': 'android-api-16', - 'build_type': 'api-16-opt', - 'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-16/nightly-without-google-play-services', - 'multi_locale_config_platform': 'android', - 'artifact_flag_build_variant_in_try': None, # There's no artifact equivalent. -} diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 989604c65038..be14a31c02a6 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -434,7 +434,6 @@ class BuildOptionParser(object): 'api-16-debug-artifact': 'builds/releng_sub_%s_configs/%s_api_16_debug_artifact.py', 'api-16-gradle': 'builds/releng_sub_%s_configs/%s_api_16_gradle.py', 'api-16-gradle-artifact': 'builds/releng_sub_%s_configs/%s_api_16_gradle_artifact.py', - 'api-16-without-google-play-services': 'builds/releng_sub_%s_configs/%s_api_16_without_google_play_services.py', 'rusttests': 'builds/releng_sub_%s_configs/%s_rusttests.py', 'rusttests-debug': 'builds/releng_sub_%s_configs/%s_rusttests_debug.py', 'x86': 'builds/releng_sub_%s_configs/%s_x86.py', diff --git a/widget/android/fennec/FennecJNINatives.h b/widget/android/fennec/FennecJNINatives.h index 8c5fc9a18757..1f537bf4ee0d 100644 --- a/widget/android/fennec/FennecJNINatives.h +++ b/widget/android/fennec/FennecJNINatives.h @@ -83,7 +83,6 @@ const JNINativeMethod MemoryMonitor::Natives::methods[] = { ::template Wrap<&Impl::DispatchMemoryPressure>) }; -#ifdef MOZ_NATIVE_DEVICES template class PresentationMediaPlayerManager::Natives : public mozilla::jni::NativeImpl { @@ -107,7 +106,6 @@ const JNINativeMethod PresentationMediaPlayerManager::Natives::methods[] = ::template Wrap<&Impl::RemovePresentationSurface>) }; -#endif // MOZ_NATIVE_DEVICES template class Telemetry::Natives : public mozilla::jni::NativeImpl { diff --git a/widget/android/fennec/FennecJNIWrappers.cpp b/widget/android/fennec/FennecJNIWrappers.cpp index 54a442627fdf..b29dd14d1c4b 100644 --- a/widget/android/fennec/FennecJNIWrappers.cpp +++ b/widget/android/fennec/FennecJNIWrappers.cpp @@ -174,7 +174,6 @@ const char MemoryMonitor::name[] = constexpr char MemoryMonitor::DispatchMemoryPressure_t::name[]; constexpr char MemoryMonitor::DispatchMemoryPressure_t::signature[]; -#ifdef MOZ_NATIVE_DEVICES const char PresentationMediaPlayerManager::name[] = "org/mozilla/gecko/PresentationMediaPlayerManager"; @@ -187,7 +186,6 @@ constexpr char PresentationMediaPlayerManager::InvalidateAndScheduleComposite_t: constexpr char PresentationMediaPlayerManager::RemovePresentationSurface_t::name[]; constexpr char PresentationMediaPlayerManager::RemovePresentationSurface_t::signature[]; -#endif // MOZ_NATIVE_DEVICES const char Telemetry::name[] = "org/mozilla/gecko/Telemetry"; diff --git a/widget/android/fennec/FennecJNIWrappers.h b/widget/android/fennec/FennecJNIWrappers.h index 9c6eb4fe5187..56865b1852c9 100644 --- a/widget/android/fennec/FennecJNIWrappers.h +++ b/widget/android/fennec/FennecJNIWrappers.h @@ -518,7 +518,6 @@ public: template class Natives; }; -#ifdef MOZ_NATIVE_DEVICES class PresentationMediaPlayerManager : public mozilla::jni::ObjectBase { public: @@ -586,7 +585,6 @@ public: template class Natives; }; -#endif // MOZ_NATIVE_DEVICES class Telemetry : public mozilla::jni::ObjectBase { public: diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index 2be96be5ae33..cf4617511110 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -1136,7 +1136,6 @@ public: } }; -#ifdef MOZ_NATIVE_DEVICES template<> const char nsWindow::NativePtr::sName[] = "LayerViewSupport"; @@ -1224,7 +1223,6 @@ public: ANativeWindow* nsWindow::PMPMSupport::sWindow; EGLSurface nsWindow::PMPMSupport::sSurface; -#endif nsWindow::GeckoViewSupport::~GeckoViewSupport() @@ -1392,11 +1390,9 @@ nsWindow::InitNatives() nsWindow::GeckoViewSupport::Base::Init(); nsWindow::LayerViewSupport::Init(); nsWindow::NPZCSupport::Init(); -#ifdef MOZ_NATIVE_DEVICES if (jni::IsFennec()) { nsWindow::PMPMSupport::Init(); } -#endif GeckoEditableSupport::Init(); } @@ -2078,13 +2074,11 @@ nsWindow::GetNativeData(uint32_t aDataType) } return nullptr; -#ifdef MOZ_NATIVE_DEVICES case NS_PRESENTATION_WINDOW: return PMPMSupport::sWindow; case NS_PRESENTATION_SURFACE: return PMPMSupport::sSurface; -#endif } return nullptr; @@ -2094,11 +2088,9 @@ void nsWindow::SetNativeData(uint32_t aDataType, uintptr_t aVal) { switch (aDataType) { -#ifdef MOZ_NATIVE_DEVICES case NS_PRESENTATION_SURFACE: PMPMSupport::sSurface = reinterpret_cast(aVal); break; -#endif } } diff --git a/widget/android/nsWindow.h b/widget/android/nsWindow.h index 43b9e17ff553..0dc25d10b7bb 100644 --- a/widget/android/nsWindow.h +++ b/widget/android/nsWindow.h @@ -193,10 +193,8 @@ private: // keep it last in the list, so its destructor is called first. mozilla::UniquePtr mGeckoViewSupport; -#ifdef MOZ_NATIVE_DEVICES // Class that implements native PresentationMediaPlayerManager calls. class PMPMSupport; -#endif mozilla::Atomic mContentDocumentDisplayed;