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

This reverts commit 4799b529349e229cba4c2d5fe48454a8b3d32d09.

This change is being reverted because it broke the git_master build
for full-eng and other targets.

diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk
index c79cd5e..d9908c1 100644 (file)
--- a/reference-ril/Android.mk
+++ b/reference-ril/Android.mk
@@ -14,12 +14,10 @@ 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 := system/core/qemu_pipe/include
+LOCAL_C_INCLUDES :=
 
 ifeq ($(TARGET_DEVICE),sooner)
   LOCAL_CFLAGS += -DUSE_TI_COMMANDS

diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c
index e8b45ef..9b9c624 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 <qemu_pipe.h>
+#include <system/qemu_pipe.h>
 
 #include "ril.h"