From da15aa0fdf5ec769a0973a00d84f9fa090de0b60 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 22 Feb 2020 19:03:00 -0500 Subject: Issue #1053 - Remove android support from XPCOM --- xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp | 2 +- xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S | 6 ------ xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp | 2 +- xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S | 6 ------ 4 files changed, 2 insertions(+), 14 deletions(-) (limited to 'xpcom/reflect') diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp index 4cd5eb47d..ef725e5e3 100644 --- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp +++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp @@ -9,7 +9,7 @@ #include "mozilla/Compiler.h" -#if !defined(__arm__) && !(defined(LINUX) || defined(ANDROID) || defined(XP_IOS)) +#if !defined(__arm__) && !(defined(LINUX) || defined(XP_IOS)) #error "This code is for Linux/iOS ARM only. Check that it works on your system, too.\nBeware that this code is highly compiler dependent." #endif diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S index 32ff3b356..9fd99faa6 100644 --- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S +++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S @@ -7,14 +7,8 @@ /* This code is for MIPS using the O32 ABI. */ -#ifdef ANDROID -#include -#include -#include -#else #include #include -#endif # NARGSAVE is the argument space in the callers frame, including extra # 'shadowed' space for the argument registers. The minimum of 4 diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp b/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp index ef4f8514d..78664dfcf 100644 --- a/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp +++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp @@ -8,7 +8,7 @@ #include "xptcprivate.h" #include "xptiprivate.h" -#if !defined(__arm__) && !(defined(LINUX) || defined(ANDROID) || defined(XP_DARWIN)) +#if !defined(__arm__) && !(defined(LINUX) || defined(XP_DARWIN)) #error "This code is for Linux/iOS ARM only. Please check if it works for you, too.\nDepends strongly on gcc behaviour." #endif diff --git a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S index d17301634..ebfba775a 100644 --- a/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S +++ b/xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S @@ -5,14 +5,8 @@ /* This code is for MIPS using the O32 ABI. */ -#ifdef ANDROID -#include -#include -#include -#else #include #include -#endif # NARGSAVE is the argument space in the callers frame, including extra # 'shadowed' space for the argument registers. The minimum of 4 -- cgit v1.2.3