commit 12db6c3cf40c198277e518a78047d5eccb6305ac
author David Turner <digit@google.com> Tue Jun 21 08:08:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 21 08:08:00 2016 +0000
tree a2f516542eab79d5bcdab5d724e282cf93ddaae2
parent 4d430566976442eae11d26aca4b04dba8608b6e6
parent c963b671f3f9e703894cbbdb7dca914eaee876f0

Merge \\"[qemu]: Use new <system/qemu_pipe.h> header.\\" am: 47a81105da
am: c963b671f3

Change-Id: Id5a2b977a6867537a51f3f740a7df28aca441a4d

reference-ril/reference-ril.c

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index b9baef1..33bca46 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -36,9 +36,9 @@
 #include <cutils/sockets.h>
 #include <termios.h>
 #include <sys/system_properties.h>
+#include <system/qemu_pipe.h>
 
 #include "ril.h"
-#include "hardware/qemu_pipe.h"
 
 #define LOG_TAG "RIL"
 #include <utils/Log.h>
@@ -3304,7 +3304,7 @@
                      * now another "legacy" way of communicating with the
                      * emulator), we will try to connecto to gsm service via
                      * qemu pipe. */
-                    fd = qemu_pipe_open("qemud:gsm");
+                    fd = qemu_pipe_open("pipe:qemud:gsm");
                     if (fd < 0) {
                         /* Qemu-specific control socket */
                         fd = socket_local_client( "qemud",

rild/rild.c

diff --git a/rild/rild.c b/rild/rild.c
index b32afe4..ad8b776 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -36,7 +36,7 @@
 #include <libril/ril_ex.h>
 
 #include <private/android_filesystem_config.h>
-#include "hardware/qemu_pipe.h"
+#include <system/qemu_pipe.h>
 
 #define LIB_PATH_PROPERTY   "rild.libpath"
 #define LIB_ARGS_PROPERTY   "rild.libargs"
@@ -240,7 +240,7 @@
 
                 sleep(1);
 
-                fd = qemu_pipe_open("qemud:gsm");
+                fd = qemu_pipe_open("pipe:qemud:gsm");
                 if (fd < 0) {
                     fd = socket_local_client(
                                 QEMUD_SOCKET_NAME,