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 | d1231c772410fd847a459cc5d92591555f90fcd7 (patch) | |
| tree | d895127d670bb13d41ec6de6234cbd8ef3362932 /tools | |
| parent | 445160942586b73bd2d8d21bfb728aa2bcee51e0 (diff) | |
| download | aura-central-d1231c772410fd847a459cc5d92591555f90fcd7.tar.gz | |
Issue mcp-graveyard/UXP%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 9a544a42e..0bedbd512 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 9a19bae10..6464da067 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 |