summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-03-15 14:36:30 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-15 14:36:30 -0700
commit57eed5b416bd72d4111a0aead2f5c71f24fde07b (patch)
treeca3b7c5fed3f0401433d6a68e67395f1bb18e55e
parent9c322c756276a9b22b05fd9c8bd67f2edfb50324 (diff)
parent38bfb5a7bfc0eeab68f25afad43245efd062caef (diff)
downloadframeworks_base-57eed5b416bd72d4111a0aead2f5c71f24fde07b.zip
frameworks_base-57eed5b416bd72d4111a0aead2f5c71f24fde07b.tar.gz
frameworks_base-57eed5b416bd72d4111a0aead2f5c71f24fde07b.tar.bz2
am 38bfb5a7: Merge "app_process: don\'t pollute the environment"
* commit '38bfb5a7bfc0eeab68f25afad43245efd062caef': app_process: don't pollute the environment
-rw-r--r--cmds/app_process/app_main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmds/app_process/app_main.cpp b/cmds/app_process/app_main.cpp
index 80df568..0668be6 100644
--- a/cmds/app_process/app_main.cpp
+++ b/cmds/app_process/app_main.cpp
@@ -153,6 +153,7 @@ int main(int argc, char* const argv[])
return -1;
}
}
+ unsetenv("NO_ADDR_COMPAT_LAYOUT_FIXUP");
#endif
// These are global variables in ProcessState.cpp