Bug 1314466 - part 6, Add new files to build r=nalexander
authorRandall Barker <rbarker@mozilla.com>
Wed, 05 Oct 2016 16:50:48 -0700
changeset 350562 4ac9b7e9b8a21d9fdb5d2ec7d1fb223565d549e2
parent 350561 a8198e0db7b505acc7d83be4684d5b7fd06c53e4
child 350563 33d7c7b42d7afc17dd8f89d61c0614a816916b44
push id10621
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 16:02:43 +0000
treeherdermozilla-aurora@dca7b42e6c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1314466
milestone52.0a1
Bug 1314466 - part 6, Add new files to build r=nalexander
mobile/android/base/AndroidManifest.xml.in
mobile/android/base/Makefile.in
mobile/android/base/moz.build
mobile/android/geckoview/src/main/AndroidManifest.xml
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -438,10 +438,27 @@
         <service
             android:name="org.mozilla.gecko.media.MediaManager"
             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:enabled="true"
+            android:exported="false"
+            android:process=":geckomediaplugin"
+            android:isolatedProcess="false">
+        </service>
+
+        <service
+            android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$tab"
+            android:enabled="true"
+            android:exported="false"
+            android:process=":tab"
+            android:isolatedProcess="false">
+        </service>
+
     </application>
 </manifest>
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -581,14 +581,20 @@ libs:: FennecJNIWrappers.cpp
 	  exit 1)
 endif
 
 libs:: classes.dex
 	$(INSTALL) classes.dex $(FINAL_TARGET)
 
 # Generate Java binder interfaces from AIDL files.
 aidl_src_path := $(srcdir)/aidl
+aidl_geckoview_src_path := $(srcdir)/../geckoview/src/main/aidl
 aidl_target_path := generated
 media_pkg := org/mozilla/gecko/media
+process_pkg := org/mozilla/gecko/process
 
 $(aidl_target_path)/$(media_pkg)/%.java:$(aidl_src_path)/$(media_pkg)/%.aidl
 	@echo "Processing AIDL: $< => $@"
 	$(AIDL) -p$(ANDROID_SDK)/framework.aidl -I$(aidl_src_path) -o$(aidl_target_path) $<
+
+$(aidl_target_path)/$(process_pkg)/%.java:$(aidl_geckoview_src_path)/$(process_pkg)/%.aidl
+	@echo "Processing AIDL: $< => $@"
+	$(AIDL) -p$(ANDROID_SDK)/framework.aidl -I$(aidl_geckoview_src_path) -o$(aidl_target_path) $<
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -272,16 +272,18 @@ gvjar.sources += [geckoview_source_dir +
     'InputConnectionListener.java',
     'InputMethods.java',
     'NotificationListener.java',
     'NSSBridge.java',
     'permissions/PermissionBlock.java',
     'permissions/Permissions.java',
     'permissions/PermissionsHelper.java',
     'PrefsHelper.java',
+    'process/GeckoProcessManager.java',
+    'process/GeckoServiceChildProcess.java',
     'ScreenManagerHelper.java',
     'sqlite/ByteBufferInputStream.java',
     'sqlite/MatrixBlobCursor.java',
     'sqlite/SQLiteBridge.java',
     'sqlite/SQLiteBridgeException.java',
     'TouchEventInterceptor.java',
 ]]
 
@@ -1141,8 +1143,12 @@ OBJDIR_PP_FILES.mobile.android.base += [
 
 gbjar.sources += ['generated/org/mozilla/gecko/' + x for x in [
     'media/ICodec.java',
     'media/ICodecCallbacks.java',
     'media/IMediaDrmBridge.java',
     'media/IMediaDrmBridgeCallbacks.java',
     'media/IMediaManager.java',
 ]]
+
+gvjar.sources += ['generated/org/mozilla/gecko/' + x for x in [
+    'process/IChildProcess.java',
+]]
--- a/mobile/android/geckoview/src/main/AndroidManifest.xml
+++ b/mobile/android/geckoview/src/main/AndroidManifest.xml
@@ -31,9 +31,26 @@
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
 
     <!-- App requires OpenGL ES 2.0 -->
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
+    <!-- New child services must also be added to the Fennec AndroidManifest.xml.in -->
+    <service
+        android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$geckomediaplugin"
+        android:enabled="true"
+        android:exported="false"
+        android:process=":geckomediaplugin"
+        android:isolatedProcess="false">
+    </service>
+
+    <service
+        android:name="org.mozilla.gecko.process.GeckoServiceChildProcess$tab"
+        android:enabled="true"
+        android:exported="false"
+        android:process=":tab"
+        android:isolatedProcess="false">
+    </service>
+
 </manifest>