Merge "Change radio related service names to slot1, slot2, slot3..."
diff --git a/reference-ril/Android.mk b/reference-ril/Android.mk
index c79cd5e..d9908c1 100644
--- a/reference-ril/Android.mk
+++ b/reference-ril/Android.mk
@@ -14,12 +14,10 @@
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 8862df4..16a279c 100644
--- a/reference-ril/reference-ril.c
+++ b/reference-ril/reference-ril.c
@@ -37,7 +37,7 @@
#include <cutils/sockets.h>
#include <termios.h>
#include <sys/system_properties.h>
-#include <qemu_pipe.h>
+#include <system/qemu_pipe.h>
#include "ril.h"
diff --git a/rild/Android.mk b/rild/Android.mk
index 5c7800d..fe81d22 100644
--- a/rild/Android.mk
+++ b/rild/Android.mk
@@ -27,9 +27,7 @@
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE:= rild
-LOCAL_MODULE_TAGS := optional
LOCAL_INIT_RC := rild.rc
-LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libril
+include $(BUILD_EXECUTABLE)
-include $(BUILD_EXECUTABLE)
\ No newline at end of file
diff --git a/rild/rild.c b/rild/rild.c
index 55592b6..ce04040 100644
--- a/rild/rild.c
+++ b/rild/rild.c
@@ -26,7 +26,7 @@
#include <telephony/ril.h>
#define LOG_TAG "RILD"
-#include <utils/Log.h>
+#include <log/log.h>
#include <cutils/properties.h>
#include <cutils/sockets.h>
#include <sys/capability.h>