diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-03-21 16:15:54 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-03-21 16:15:54 +0000 |
| commit | b59777a67b8e0180eed34d43117db73186c7e1e1 (patch) | |
| tree | d895127d670bb13d41ec6de6234cbd8ef3362932 /js | |
| parent | a94a86ff785e246caa9c71b2914e0bb5f7b03333 (diff) | |
| download | uxp-b59777a67b8e0180eed34d43117db73186c7e1e1.tar.gz | |
Issue #1053 - Remove __ANDROID__ defines (except in third party code)
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/jit/JitSpewer.cpp | 2 | ||||
| -rw-r--r-- | js/src/jit/PerfSpewer.cpp | 11 | ||||
| -rw-r--r-- | js/src/threading/posix/ConditionVariable.cpp | 5 |
3 files changed, 2 insertions, 16 deletions
diff --git a/js/src/jit/JitSpewer.cpp b/js/src/jit/JitSpewer.cpp index 0248c0a71f..12544b9301 100644 --- a/js/src/jit/JitSpewer.cpp +++ b/js/src/jit/JitSpewer.cpp @@ -30,8 +30,6 @@ #ifndef JIT_SPEW_DIR # if defined(_WIN32) # define JIT_SPEW_DIR "" -# elif defined(__ANDROID__) -# define JIT_SPEW_DIR "/data/local/tmp/" # else # define JIT_SPEW_DIR "/tmp/" # endif diff --git a/js/src/jit/PerfSpewer.cpp b/js/src/jit/PerfSpewer.cpp index 2dfa2c1f54..d428a8f926 100644 --- a/js/src/jit/PerfSpewer.cpp +++ b/js/src/jit/PerfSpewer.cpp @@ -28,12 +28,7 @@ // so also try /sdcard/. #ifndef PERF_SPEW_DIR -# if defined(__ANDROID__) -# define PERF_SPEW_DIR "/data/local/tmp/" -# define PERF_SPEW_DIR_2 "/sdcard/" -# else # define PERF_SPEW_DIR "/tmp/" -# endif #endif using namespace js; @@ -104,12 +99,6 @@ js::jit::CheckPerf() { return; } -#if defined(__ANDROID__) - if (openPerfMap(PERF_SPEW_DIR_2)) { - PerfChecked = true; - return; - } -#endif fprintf(stderr, "Failed to open perf map file. Disabling IONPERF.\n"); PerfMode = PERF_MODE_NONE; } diff --git a/js/src/threading/posix/ConditionVariable.cpp b/js/src/threading/posix/ConditionVariable.cpp index 6189fab989..fe768eae3b 100644 --- a/js/src/threading/posix/ConditionVariable.cpp +++ b/js/src/threading/posix/ConditionVariable.cpp @@ -22,9 +22,8 @@ using mozilla::TimeStamp; static const long NanoSecPerSec = 1000000000; -// Android 32-bit & macOS 10.12 has the clock functions, but not pthread_condattr_setclock. -#if defined(HAVE_CLOCK_MONOTONIC) && \ - !(defined(__ANDROID__) && !defined(__LP64__)) && !defined(__APPLE__) +// MacOS 10.12 has the clock functions, but not pthread_condattr_setclock. +#if defined(HAVE_CLOCK_MONOTONIC) && !defined(__APPLE__) # define USE_CLOCK_API #endif |