diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-02-22 21:16:37 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 12:52:45 +0200 |
| commit | 6ef03f136bac6d677d67d1bcc4e110e891e7c4ca (patch) | |
| tree | d452cf5abdb5737927c7ab2ad34e5681d061b5c1 /mozglue/linker/CustomElf.cpp | |
| parent | d6bcaa649127bc524087452c389f6dcee118cbfb (diff) | |
| download | UXP-6ef03f136bac6d677d67d1bcc4e110e891e7c4ca.tar UXP-6ef03f136bac6d677d67d1bcc4e110e891e7c4ca.tar.gz UXP-6ef03f136bac6d677d67d1bcc4e110e891e7c4ca.tar.lz UXP-6ef03f136bac6d677d67d1bcc4e110e891e7c4ca.tar.xz UXP-6ef03f136bac6d677d67d1bcc4e110e891e7c4ca.zip | |
Issue #1053 - Remove android support from mozglue
Yes, I checked for unsaved files this time...
Diffstat (limited to 'mozglue/linker/CustomElf.cpp')
| -rw-r--r-- | mozglue/linker/CustomElf.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mozglue/linker/CustomElf.cpp b/mozglue/linker/CustomElf.cpp index dbab0cf0d..98d94fa8f 100644 --- a/mozglue/linker/CustomElf.cpp +++ b/mozglue/linker/CustomElf.cpp @@ -20,15 +20,8 @@ using namespace mozilla; /* Function used to report library mappings from the custom linker to Gecko * crash reporter */ -#ifdef ANDROID -extern "C" { - void report_mapping(char *name, void *base, uint32_t len, uint32_t offset); - void delete_mapping(const char *name); -} -#else #define report_mapping(...) #define delete_mapping(...) -#endif const Ehdr *Ehdr::validate(const void *buf) { @@ -162,13 +155,10 @@ CustomElf::Load(Mappable *mappable, const char *path, int flags) break; case PT_GNU_STACK: debug_phdr("PT_GNU_STACK", phdr); -// Skip on Android until bug 706116 is fixed -#ifndef ANDROID if (phdr->p_flags & PF_X) { ERROR("%s: Executable stack is not supported", elf->GetPath()); return nullptr; } -#endif break; #ifdef __ARM_EABI__ case PT_ARM_EXIDX: |