Revert "Revert "Emulator: adjust reference-ril to the refactored qemu_pipe""

This reverts commit 05bab0b719b75925482ab8631ceefc279ecb8656.

Change-Id: I9064151573cf6fdc6b84f9708b5ae223ef42d318

diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk
index d9908c1..08681c1 100644 (file)
--- a/reference-ril/Android.mk
+++ b/reference-ril/Android.mk
@@ -14,6 +14,8 @@ LOCAL_SRC_FILES:= \
 LOCAL_SHARED_LIBRARIES := \
     liblog libcutils libutils libril librilutils
 
+LOCAL_STATIC_LIBRARIES := libqemu_pipe libbase
+
 # for asprinf
 LOCAL_CFLAGS := -D_GNU_SOURCE
 

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"