From 2aaa46a5216110f06fd8146b9df4dac5f1f66be8 Mon Sep 17 00:00:00 2001
From: Paddy Byers <paddy.byers@gmail.com>
Date: Fri, 25 Nov 2011 21:35:17 +0000
Subject: [PATCH] Remove manipulation of environ in SetupArgs()

---
 src/platform_android.cc | 42 +----------------------------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/platform_android.cc b/src/platform_android.cc
index 7ed782db9b79..2f4a2aa63756 100644
--- a/src/platform_android.cc
+++ b/src/platform_android.cc
@@ -61,47 +61,7 @@ static struct {
 
 
 char** Platform::SetupArgs(int argc, char *argv[]) {
-  char **new_argv;
-  char **new_env;
-  size_t size;
-  int envc;
-  char *s;
-  int i;
-
-  for (envc = 0; environ[envc]; envc++);
-
-  s = envc ? environ[envc - 1] : argv[argc - 1];
-
-  process_title.str = argv[0];
-  process_title.len = s + strlen(s) + 1 - argv[0];
-
-  size = process_title.len;
-  size += (argc + 1) * sizeof(char **);
-  size += (envc + 1) * sizeof(char **);
-
-  if ((s = (char *) malloc(size)) == NULL) {
-    process_title.str = NULL;
-    process_title.len = 0;
-    return argv;
-  }
-
-  new_argv = (char **) s;
-  new_env = new_argv + argc + 1;
-  s = (char *) (new_env + envc + 1);
-  memcpy(s, process_title.str, process_title.len);
-
-  for (i = 0; i < argc; i++)
-    new_argv[i] = s + (argv[i] - argv[0]);
-  new_argv[argc] = NULL;
-
-  s += environ[0] - argv[0];
-
-  for (i = 0; i < envc; i++)
-    new_env[i] = s + (environ[i] - environ[0]);
-  new_env[envc] = NULL;
-
-  environ = new_env;
-  return new_argv;
+  return argv;
 }