Bug 1532756 - Rename geckomediaplugin to gmplugin on Android; r=droeh a=lizzard
authorDan Minor <dminor@mozilla.com>
Thu, 07 Mar 2019 16:24:28 +0000
changeset 516329 77dcf9bd89d01d422319bd2c8aeae598a38c4cb5
parent 516328 11506a4e0fd8088f20b70a27e96e9b3170c9d5fb
child 516330 e8fd50fb1d542b3d357d9c67616ce59f63c8f9f9
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdroeh, lizzard
bugs1532756, 1514043
milestone66.0
Bug 1532756 - Rename geckomediaplugin to gmplugin on Android; r=droeh a=lizzard 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 {}
 }