Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't set ADDR_COMPAT_LAYOUT on the emulator"

Browse Source
This commit is contained in:
Nick Kralevich
2013-04-23 23:33:52 +00:00
committed by Gerrit Code Review
parent be4536d214 fc17dc2548
commit 35587a0c47
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/app_process/app_main.cpp
View File

@@ -7,6 +7,7 @@
#define LOG_TAG "appproc" #define LOG_TAG "appproc"
#include <cutils/properties.h>
#include <binder/IPCThreadState.h> #include <binder/IPCThreadState.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>
#include <utils/Log.h> #include <utils/Log.h>
@@ -144,7 +145,10 @@ int main(int argc, char* const argv[])
* This breaks some programs which improperly embed * This breaks some programs which improperly embed
* an out of date copy of Android's linker. * 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); int current = personality(0xFFFFFFFF);
if ((current & ADDR_COMPAT_LAYOUT) == 0) { if ((current & ADDR_COMPAT_LAYOUT) == 0) {
personality(current | ADDR_COMPAT_LAYOUT); personality(current | ADDR_COMPAT_LAYOUT);