Emulator: adjust reference-ril to the refactored qemu_pipe

qemu_pipe is refactored into a library in system/core/qemu_pipe,
and reference-ril needs to adjust accordingly.

Change-Id: I13160ce6a07a721501fd893dd9c5a9931927e767
(cherry picked from aosp commit 7b7267ac17fa6d557a762f23cb5b7e97de21372f)

diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk
index d9908c1..c79cd5e 100644 (file)
--- a/reference-ril/Android.mk
+++ b/reference-ril/Android.mk
@@ -14,10 +14,12 @@ LOCAL_SRC_FILES:= \
 LOCAL_SHARED_LIBRARIES := \
     liblog libcutils libutils libril librilutils
 
+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
+
 # for asprinf
 LOCAL_CFLAGS := -D_GNU_SOURCE
 
-LOCAL_C_INCLUDES :=
+LOCAL_C_INCLUDES := system/core/qemu_pipe/include
 
 ifeq ($(TARGET_DEVICE),sooner)
   LOCAL_CFLAGS += -DUSE_TI_COMMANDS

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index 9b9c624..e8b45ef 100644 (file)
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -37,7 +37,7 @@
 #include <cutils/sockets.h>
 #include <sys/system_properties.h>
 #include <termios.h>
-#include <system/qemu_pipe.h>
+#include <qemu_pipe.h>
 
 #include "ril.h"