Merge branch 'redwood' into 28.9-platform

3 files changed, 0 insertions, 21 deletions

diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h
index 53034fcd8..a3ee5a517 100644
--- a/xpcom/build/BinaryPath.h
+++ b/xpcom/build/BinaryPath.h
@@ -84,22 +84,6 @@ private:
     return rv;
   }
 
-#elif defined(ANDROID)
-  static nsresult Get(const char* argv0, char aResult[MAXPATHLEN])
-  {
-    // On Android, we use the GRE_HOME variable that is set by the Java
-    // bootstrap code.
-    const char* greHome = getenv("GRE_HOME");
-
-    if (!greHome) {
-      return NS_ERROR_FAILURE;
-    }
-
-    snprintf(aResult, MAXPATHLEN, "%s/%s", greHome, "dummy");
-    aResult[MAXPATHLEN - 1] = '\0';
-    return NS_OK;
-  }
-
 #elif defined(XP_UNIX)
   static nsresult Get(const char* aArgv0, char aResult[MAXPATHLEN])
   {
diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp
index b89f51a98..bb639248c 100644
--- a/xpcom/build/XPCOMInit.cpp
+++ b/xpcom/build/XPCOMInit.cpp
@@ -569,13 +569,11 @@ NS_InitXPCOM2(nsIServiceManager** aResult,
     return rv;
   }
 
-#ifndef ANDROID
   // If the locale hasn't already been setup by our embedder,
   // get us out of the "C" locale and into the system
   if (strcmp(setlocale(LC_ALL, nullptr), "C") == 0) {
     setlocale(LC_ALL, "");
   }
-#endif
 
 #if defined(XP_UNIX)
   NS_StartupNativeCharsetUtils();
diff --git a/xpcom/build/XREChildData.h b/xpcom/build/XREChildData.h
index c849131d6..7cda74d97 100644
--- a/xpcom/build/XREChildData.h
+++ b/xpcom/build/XREChildData.h
@@ -20,13 +20,10 @@ class GMPLoader;
  */
 struct XREChildData
 {
-#if !defined(MOZ_WIDGET_ANDROID)
   /**
    * Used to load the GMP binary.
    */
   mozilla::UniquePtr<mozilla::gmp::GMPLoader> gmpLoader;
-#endif
-
 };
 
 #endif // XREChildData_h