Bug 1532756 - Rename geckomediaplugin to gmplugin on Android; r=droeh
authorDan Minor <dminor@mozilla.com>
Thu, 07 Mar 2019 16:24:28 +0000
changeset 520863 e038e06397ad7ad63e52bda514979d7dfc3f6133
parent 520862 4f2a5c6feccfaa46c1fbaa7086466a22dc858a97
child 520864 12d0f0ba867ac82759ad8f21e8cc99b815e35300
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdroeh
bugs1532756, 1514043
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1532756 - Rename geckomediaplugin to gmplugin on Android; r=droeh In Bug 1514043 we renamed the geckomediaplugin to gmplugin, but missed renaming it on Android. This prevents the plugin from loading, which breaks OpenH264 in WebRTC. Differential Revision: https://phabricator.services.mozilla.com/D22502
mobile/android/base/AndroidManifest.xml.in
mobile/android/geckoview/src/main/AndroidManifest.xml
mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -510,20 +510,20 @@
             android:enabled="true"
             android:exported="false"
             android:process=":media"
             android:isolatedProcess="false">
         </service>
 
         <!-- New child services must also be added to the GeckoView AndroidManifest.xml -->
         <service
-            android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$geckomediaplugin"
+            android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$gmplugin"
             android:enabled="true"
             android:exported="false"
-            android:process=":geckomediaplugin"
+            android:process=":gmplugin"
             android:isolatedProcess="false">
         </service>
 
         <service
             android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$tab"
             android:enabled="true"
             android:exported="false"
             android:process=":tab"
--- a/mobile/android/geckoview/src/main/AndroidManifest.xml
+++ b/mobile/android/geckoview/src/main/AndroidManifest.xml
@@ -43,30 +43,30 @@
         <service
                 android:name="org.mozilla.gecko.media.MediaManager"
                 android:enabled="true"
                 android:exported="false"
                 android:isolatedProcess="false"
                 android:process=":media">
         </service>
         <service
-                android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$geckomediaplugin"
+                android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$gmplugin"
                 android:enabled="true"
                 android:exported="false"
                 android:isolatedProcess="false"
-                android:process=":geckomediaplugin">
+                android:process=":gmplugin">
         </service>
         <service
                 android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$tab"
                 android:enabled="true"
                 android:exported="false"
                 android:isolatedProcess="false"
                 android:process=":tab">
         </service>
         <service
                 android:name="org.mozilla.gecko.gfx.SurfaceAllocatorService"
                 android:enabled="true"
                 android:exported="false"
                 android:isolatedProcess="false">
         </service>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoServiceChildProcess.java
@@ -136,12 +136,12 @@ public class GeckoServiceChildProcess ex
     @Override
     public boolean onUnbind(Intent intent) {
         Log.i(LOGTAG, "Service has been unbound. Stopping.");
         stopSelf();
         Process.killProcess(Process.myPid());
         return false;
     }
 
-    public static final class geckomediaplugin extends GeckoServiceChildProcess {}
+    public static final class gmplugin extends GeckoServiceChildProcess {}
 
     public static final class tab extends GeckoServiceChildProcess {}
 }