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 /tools | |
| parent | a94a86ff785e246caa9c71b2914e0bb5f7b03333 (diff) | |
| download | uxp-b59777a67b8e0180eed34d43117db73186c7e1e1.tar.gz | |
Issue #1053 - Remove __ANDROID__ defines (except in third party code)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/profiler/core/PlatformMacros.h | 10 | ||||
| -rw-r--r-- | tools/profiler/lul/LulPlatformMacros.h | 12 |
2 files changed, 1 insertions, 21 deletions
diff --git a/tools/profiler/core/PlatformMacros.h b/tools/profiler/core/PlatformMacros.h index 9a544a42e3..0bedbd512f 100644 --- a/tools/profiler/core/PlatformMacros.h +++ b/tools/profiler/core/PlatformMacros.h @@ -34,16 +34,6 @@ # define SPS_ARCH_amd64 1 # define SPS_OS_linux 1 -#elif defined(__ANDROID__) && defined(__arm__) -# define SPS_PLAT_arm_android 1 -# define SPS_ARCH_arm 1 -# define SPS_OS_android 1 - -#elif defined(__ANDROID__) && defined(__i386__) -# define SPS_PLAT_x86_android 1 -# define SPS_ARCH_x86 1 -# define SPS_OS_android 1 - #elif defined(__linux__) && defined(__i386__) # define SPS_PLAT_x86_linux 1 # define SPS_ARCH_x86 1 diff --git a/tools/profiler/lul/LulPlatformMacros.h b/tools/profiler/lul/LulPlatformMacros.h index 9a19bae106..6464da0678 100644 --- a/tools/profiler/lul/LulPlatformMacros.h +++ b/tools/profiler/lul/LulPlatformMacros.h @@ -30,21 +30,11 @@ # define LUL_ARCH_x64 1 # define LUL_OS_linux 1 -#elif defined(__linux__) && defined(__i386__) && !defined(__ANDROID__) +#elif defined(__linux__) && defined(__i386__) # define LUL_PLAT_x86_linux 1 # define LUL_ARCH_x86 1 # define LUL_OS_linux 1 -#elif defined(__ANDROID__) && defined(__arm__) -# define LUL_PLAT_arm_android 1 -# define LUL_ARCH_arm 1 -# define LUL_OS_android 1 - -#elif defined(__ANDROID__) && defined(__i386__) -# define LUL_PLAT_x86_android 1 -# define LUL_ARCH_x86 1 -# define LUL_OS_android 1 - #else # error "Unsupported platform" #endif |