From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 1 Nov 2013 10:40:05 +0000 (-0700)
Subject: android: Run through valgrind with the system-emulator
X-Git-Tag: android-x86-4.4-r3~7037
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ac9589731415bce09b361963f384c5b1d949d7f;p=android-x86%2Fexternal-bluetooth-bluez.git

android: Run through valgrind with the system-emulator
---

diff --git a/android/system-emulator.c b/android/system-emulator.c
index 8ca4fe1d5..7d1754637 100644
--- a/android/system-emulator.c
+++ b/android/system-emulator.c
@@ -46,12 +46,21 @@ static pid_t daemon_pid = -1;
 
 static void ctl_start(void)
 {
-	char *prg_argv[1] = { NULL };
 	char prg_name[PATH_MAX + 1];
+	char *prg_argv[3];
+	char *prg_envp[3];
 	pid_t pid;
 
 	snprintf(prg_name, sizeof(prg_name), "%s/%s", exec_dir, "bluetoothd");
 
+	prg_argv[0] = "/usr/bin/valgrind";
+	prg_argv[1] = prg_name;
+	prg_argv[2] = NULL;
+
+	prg_envp[0] = "G_SLICE=always-malloc";
+	prg_envp[1] = "G_DEBUG=gc-friendly";
+	prg_envp[2] = NULL;
+
 	printf("Starting %s\n", prg_name);
 
 	pid = fork();
@@ -61,7 +70,7 @@ static void ctl_start(void)
 	}
 
 	if (pid == 0) {
-		execv(prg_name, prg_argv);
+		execve(prg_argv[0], prg_argv, prg_envp);
 		exit(0);
 	}