4 files changed, 10 insertions, 79 deletions
diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in
index d5593724c..c25119ac3 100644
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@@ -18,10 +18,6 @@ include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
-ifneq ($(MOZ_WIDGET_TOOLKIT),android)
-#LIBS += ../contentproc/$(LIB_PREFIX)plugin-container.$(LIB_SUFFIX)
-endif
-
 ifeq ($(OS_ARCH),WINNT) #{
 # Note the manifest file exists in the tree, so we use the explicit filename
 # here.
diff --git a/ipc/app/MozillaRuntimeMainAndroid.cpp b/ipc/app/MozillaRuntimeMainAndroid.cpp
deleted file mode 100644
index 81b89eef5..000000000
--- a/ipc/app/MozillaRuntimeMainAndroid.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: sw=4 ts=4 et :
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <dlfcn.h>
-#include <android/log.h>
-
-int
-main(int argc, char* argv[])
-{
-    // Check for the absolute minimum number of args we need to move
-    // forward here. We expect the last arg to be the child process type.
-    if (argc < 2)
-        return 1;
-
-    void *mozloader_handle = dlopen("libmozglue.so", RTLD_LAZY);
-    if (!mozloader_handle) {
-      __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad",
-                          "Couldn't load mozloader because %s", dlerror());
-        return 1;
-    }
-
-    typedef int (*ChildProcessInit_t)(int, char**);
-    ChildProcessInit_t fChildProcessInit =
-        (ChildProcessInit_t)dlsym(mozloader_handle, "ChildProcessInit");
-    if (!fChildProcessInit) {
-        __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad",
-                            "Couldn't load cpi_t because %s", dlerror());
-        return 1;
-    }
-
-    return fChildProcessInit(argc, argv);
-}
diff --git a/ipc/app/moz.build b/ipc/app/moz.build
index 3e6461584..306446a86 100644
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@@ -4,21 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# Any changes that affect Android need to be made in pie/moz.build as well.
+GeckoProgram(CONFIG['MOZ_CHILD_PROCESS_NAME'], linkage='dependent')
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    Program(CONFIG['MOZ_CHILD_PROCESS_NAME'])
-    SOURCES += [
-        'MozillaRuntimeMainAndroid.cpp',
-    ]
-
-    DIRS += ['pie']
-else:
-    GeckoProgram(CONFIG['MOZ_CHILD_PROCESS_NAME'], linkage='dependent')
-
-    SOURCES += [
-        'MozillaRuntimeMain.cpp',
-    ]
+SOURCES += [
+    'MozillaRuntimeMain.cpp',
+]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
@@ -29,13 +19,12 @@ LOCAL_INCLUDES += [
 
 # We link GMPLoader into plugin-container on desktop so that its code is
 # covered by the desktop DRM vendor's voucher.
-if CONFIG['OS_TARGET'] != 'Android':
-    SOURCES += [
-        '../../dom/media/gmp/GMPLoader.cpp',
-    ]
-    USE_LIBS += [
-        'rlz',
-    ]
+SOURCES += [
+    '../../dom/media/gmp/GMPLoader.cpp',
+]
+USE_LIBS += [
+    'rlz',
+]
 
 # DELAYLOAD_DLLS in this block ensures that the DLL blocklist is functional
 if CONFIG['OS_ARCH'] == 'WINNT':
diff --git a/ipc/app/pie/moz.build b/ipc/app/pie/moz.build
deleted file mode 100644
index 6924199b5..000000000
--- a/ipc/app/pie/moz.build
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-Program(CONFIG['MOZ_CHILD_PROCESS_NAME_PIE'])
-SOURCES += [
-    '../MozillaRuntimeMainAndroid.cpp',
-]
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-LOCAL_INCLUDES += [
-    '/toolkit/xre',
-    '/xpcom/base',
-]
-
-LDFLAGS += ['-pie']