diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-10-14 16:57:01 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-01 15:17:54 +0200 |
| commit | 28a3cd1028612b3b577768519d11fa6fbcda6f09 (patch) | |
| tree | 61a64f843d3bfed644305987dbe1482d7b39c11a /js/xpconnect | |
| parent | f987138760b344a8869e319f28400acc438d0553 (diff) | |
| download | uxp-28a3cd1028612b3b577768519d11fa6fbcda6f09.tar.gz | |
Issue #1053 - First pass Android defines and remove Android Annotation
processors, some Andoid packaging stuff, Eclipse IDE support et al.
Diffstat (limited to 'js/xpconnect')
| -rw-r--r-- | js/xpconnect/loader/mozJSComponentLoader.cpp | 6 | ||||
| -rw-r--r-- | js/xpconnect/src/Sandbox.cpp | 4 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCJSContext.cpp | 6 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCShellImpl.cpp | 7 |
4 files changed, 0 insertions, 23 deletions
diff --git a/js/xpconnect/loader/mozJSComponentLoader.cpp b/js/xpconnect/loader/mozJSComponentLoader.cpp index 5b9e09a0a1..f4f3297469 100644 --- a/js/xpconnect/loader/mozJSComponentLoader.cpp +++ b/js/xpconnect/loader/mozJSComponentLoader.cpp @@ -9,9 +9,6 @@ #include <cstdarg> #include "mozilla/Logging.h" -#ifdef ANDROID -#include <android/log.h> -#endif #ifdef XP_WIN #include <windows.h> #endif @@ -101,9 +98,6 @@ Dump(JSContext* cx, unsigned argc, Value* vp) if (!utf8str.encodeUtf8(cx, str)) return false; -#ifdef ANDROID - __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", utf8str.ptr()); -#endif #ifdef XP_WIN if (IsDebuggerPresent()) { nsAutoJSString wstr; diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp index ba40e120ed..569da5d56f 100644 --- a/js/xpconnect/src/Sandbox.cpp +++ b/js/xpconnect/src/Sandbox.cpp @@ -127,10 +127,6 @@ SandboxDump(JSContext* cx, unsigned argc, Value* vp) if (!cstr) return false; -#ifdef ANDROID - __android_log_write(ANDROID_LOG_INFO, "GeckoDump", cstr); -#endif - fputs(cstr, stdout); fflush(stdout); args.rval().setBoolean(true); diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp index a9f779b894..48a3aa26ac 100644 --- a/js/xpconnect/src/XPCJSContext.cpp +++ b/js/xpconnect/src/XPCJSContext.cpp @@ -3226,12 +3226,6 @@ XPCJSContext::Initialize() : 120 * 1024; //win32 // The following two configurations are linux-only. Given the numbers above, // we use 50k and 100k trusted buffers on 32-bit and 64-bit respectively. -#elif defined(ANDROID) - // Android appears to have 1MB stacks. Allow the use of 3/4 of that size - // (768KB on 32-bit), since otherwise we can crash with a stack overflow - // when nearing the 1MB limit. - const size_t kStackQuota = kDefaultStackQuota + kDefaultStackQuota / 2; - const size_t kTrustedScriptBuffer = sizeof(size_t) * 12800; #elif defined(DEBUG) // Bug 803182: account for the 4x difference in the size of js::Interpret // between optimized and debug builds. diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index c0e9532a96..e4e0db96f2 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -36,10 +36,6 @@ #include "base/histogram.h" -#ifdef ANDROID -#include <android/log.h> -#endif - #ifdef XP_WIN #include "mozilla/widget/AudioSession.h" #include <windows.h> @@ -309,9 +305,6 @@ Dump(JSContext* cx, unsigned argc, Value* vp) if (!utf8str.encodeUtf8(cx, str)) return false; -#ifdef ANDROID - __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", utf8str.ptr()); -#endif #ifdef XP_WIN if (IsDebuggerPresent()) { nsAutoJSString wstr; |