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

Don't use ADDR_COMPAT_LAYOUT on the emulator

Browse Source 
For the emulator, we want people to see memory as it
actually is, not how we're hacking around buggy apps. Don't
set ADDR_COMPAT_LAYOUT on the emulator.

For reasons that I don't understand, personality(ADDR_COMPAT_LAYOUT)
does not persist across an exec on the emulator. app_main gets
into a tight loop restarting itself because of this. This change
also works around that bug.

Change-Id: Ia73a7d2d623c25cf39d248145d97307945d554da
This commit is contained in:
Nick Kralevich
2013-03-14 16:31:34 -07:00
parent f732108e86
commit 5fa1ee779e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmds/app_process/app_main.cpp
View File

@@ -12,6 +12,7 @@
#include <utils/Log.h>
#include <cutils/process_name.h>
#include <cutils/memory.h>
#include <cutils/properties.h>
#include <android_runtime/AndroidRuntime.h>
#include <sys/personality.h>
@@ -143,11 +144,15 @@ int main(int argc, char* const argv[])
* This breaks some programs which improperly embed
* an out of date copy of Android's linker.
*/
int current = personality(0xFFFFFFFF);
if ((current & ADDR_COMPAT_LAYOUT) == 0) {
personality(current | ADDR_COMPAT_LAYOUT);
execv("/system/bin/app_process", argv);
return -1;
char value[PROPERTY_VALUE_MAX];
property_get("ro.kernel.qemu", value, "");
if (strcmp(value, "1") != 0) {
int current = personality(0xFFFFFFFF);
if ((current & ADDR_COMPAT_LAYOUT) == 0) {
personality(current | ADDR_COMPAT_LAYOUT);
execv("/system/bin/app_process", argv);
return -1;
}
}
#endif