Bug 935676 - Stub out missing Flash symbols r=glandium

--HG--
extra : rebase_source : 7e02a6283a6ee53b3749e1816d4005b238085954
This commit is contained in:
James Willcox 2014-01-15 09:16:33 -06:00
Родитель 1ff222c375
Коммит 8cb44b437e
1 изменённых файлов: 15 добавлений и 0 удалений

Просмотреть файл

@ -64,6 +64,11 @@ void debug_phdr(const char *type, const Phdr *phdr)
phdr->p_flags & PF_W ? 'w' : '-', phdr->p_flags & PF_X ? 'x' : '-');
}
void
__void_stub(void)
{
}
} /* anonymous namespace */
/**
@ -321,6 +326,16 @@ CustomElf::GetSymbolPtrInDeps(const char *symbol) const
#endif
}
#define MISSING_FLASH_SYMNAME_START "_ZN7android10VectorImpl19reservedVectorImpl"
// Android changed some symbols that Flash depended on in 4.4,
// so stub those out here
if (strncmp(symbol,
MISSING_FLASH_SYMNAME_START,
sizeof(MISSING_FLASH_SYMNAME_START) - 1) == 0) {
return FunctionPtr(__void_stub);
}
void *sym;
/* Search the symbol in the main program. Note this also tries all libraries
* the system linker will have loaded RTLD_GLOBAL. Unfortunately, that doesn't