Merge "Don't use ADDR_COMPAT_LAYOUT on the emulator" (1ae6ae20) · Commits · e / os / android_frameworks_base

cmds/app_process/app_main.cpp

+10 −5

Original line number	Diff line number	Diff line
		@@ -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,12 +144,16 @@ int main(int argc, char* const argv[])
		* This breaks some programs which improperly embed
		* an out of date copy of Android's linker.
		*/
		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

		// These are global variables in ProcessState.cpp