Bug 574120 - Add IPC support to android embedding code, r=blassey

embedding/android/App.java.in

@@ -44,5 +44,8 @@ public class App extends GeckoApp {
     public String getAppName() {
 	return "@MOZ_APP_NAME@";
     }
+    public String getContentProcessName() {
+        return "@MOZ_CHILD_PROCESS_NAME@";
+    }
 };
 

embedding/android/GeckoApp.java

@@ -270,6 +270,7 @@ abstract public class GeckoApp
     }
 
     abstract public String getAppName();
+    abstract public String getContentProcessName();
 
     protected void unpackComponents()
     {
@@ -323,6 +324,7 @@ abstract public class GeckoApp
         } while (status != StreamTokenizer.TT_EOF);
 
         unpackFile(zip, buf, null, "application.ini");
+        unpackFile(zip, buf, null, getContentProcessName());
     }
 
     private void unpackFile(ZipFile zip, byte[] buf, ZipEntry fileEntry, String name)

embedding/android/Makefile.in

@@ -41,6 +41,7 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/ipc/app/defs.mk
 
 JAVAFILES = \
   GeckoApp.java \
@@ -51,7 +52,8 @@ JAVAFILES = \
 
 DEFINES += \
   -DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
-  -DMOZ_APP_NAME=$(MOZ_APP_NAME)
+  -DMOZ_APP_NAME=$(MOZ_APP_NAME) \
+  -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
 
 GARBAGE += \
   AndroidManifest.xml  \
@@ -99,6 +101,10 @@ DIST_LINK_FILES = \
   blocklist.xml \
   $(NULL)
 
+ifdef MOZ_IPC
+DIST_LINK_FILES += $(MOZ_CHILD_PROCESS_NAME)
+endif
+
 JAVA_CLASSPATH = $(ANDROID_SDK)/android.jar
 
 include $(topsrcdir)/config/rules.mk