Don't set ADDR_COMPAT_LAYOUT on the emulator

Don't work around third party app bugs on the emulator.

Change-Id: I4440fcd56b72e3a74881ddec2a469f037a060525
This commit is contained in:
Nick Kralevich
2013-04-23 15:30:45 -07:00
parent be4536d214
commit fc17dc2548

View File

@@ -7,6 +7,7 @@
#define LOG_TAG "appproc"
#include <cutils/properties.h>
#include <binder/IPCThreadState.h>
#include <binder/ProcessState.h>
#include <utils/Log.h>
@@ -144,7 +145,10 @@ int main(int argc, char* const argv[])
* This breaks some programs which improperly embed
* an out of date copy of Android's linker.
*/
if (getenv("NO_ADDR_COMPAT_LAYOUT_FIXUP") == NULL) {
char value[PROPERTY_VALUE_MAX];
property_get("ro.kernel.qemu", value, "");
bool is_qemu = (strcmp(value, "1") == 0);
if ((getenv("NO_ADDR_COMPAT_LAYOUT_FIXUP") == NULL) && !is_qemu) {
int current = personality(0xFFFFFFFF);
if ((current & ADDR_COMPAT_LAYOUT) == 0) {
personality(current | ADDR_COMPAT_LAYOUT);