diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:58 +0200 |
| commit | 6571d2ceb42930dab01677ef0e95e732d5076fb8 (patch) | |
| tree | 8c593b8e09f2cfb457df72d40dc719bb0e0df066 /xpcom/build | |
| parent | 2f359ed80ccb2cab440c0cda886404ed42ad9fdf (diff) | |
| download | UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.gz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.lz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.xz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.zip | |
Remove MOZ_WIDGET_GONK [1/2]
Tag #288
Diffstat (limited to 'xpcom/build')
| -rw-r--r-- | xpcom/build/BinaryPath.h | 5 | ||||
| -rw-r--r-- | xpcom/build/XPCOMInit.cpp | 11 | ||||
| -rw-r--r-- | xpcom/build/XREChildData.h | 2 |
3 files changed, 1 insertions, 17 deletions
diff --git a/xpcom/build/BinaryPath.h b/xpcom/build/BinaryPath.h index 374763c79..53034fcd8 100644 --- a/xpcom/build/BinaryPath.h +++ b/xpcom/build/BinaryPath.h @@ -90,11 +90,6 @@ private: // On Android, we use the GRE_HOME variable that is set by the Java // bootstrap code. const char* greHome = getenv("GRE_HOME"); -#if defined(MOZ_WIDGET_GONK) - if (!greHome) { - greHome = "/system/b2g"; - } -#endif if (!greHome) { return NS_ERROR_FAILURE; diff --git a/xpcom/build/XPCOMInit.cpp b/xpcom/build/XPCOMInit.cpp index 6fb50fc1d..7b220558f 100644 --- a/xpcom/build/XPCOMInit.cpp +++ b/xpcom/build/XPCOMInit.cpp @@ -1104,17 +1104,6 @@ ShutdownXPCOM(nsIServiceManager* aServMgr) NS_LogTerm(); -#if defined(MOZ_WIDGET_GONK) - // This _exit(0) call is intended to be temporary, to get shutdown leak - // checking working on non-B2G platforms. - // On debug B2G, the child process crashes very late. Instead, just - // give up so at least we exit cleanly. See bug 1071866. - if (XRE_IsContentProcess()) { - NS_WARNING("Exiting child process early!"); - _exit(0); - } -#endif - return NS_OK; } diff --git a/xpcom/build/XREChildData.h b/xpcom/build/XREChildData.h index 96b297d3c..c849131d6 100644 --- a/xpcom/build/XREChildData.h +++ b/xpcom/build/XREChildData.h @@ -20,7 +20,7 @@ class GMPLoader; */ struct XREChildData { -#if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_GONK) +#if !defined(MOZ_WIDGET_ANDROID) /** * Used to load the GMP binary. */ |