ril: move record_stream_xxx to librilutils and export header

Change-Id: I9986c8c5fb1777bbd2b686769ecc726319a73100 Signed-off-by: Dima Zavin <[email protected]>
AOKP · May 23, 2013 · 622bf2b · 622bf2b
1 parent f467af6
commit 622bf2b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/libril/record_stream.h → include/telephony/record_stream.h b/libril/record_stream.h → include/telephony/record_stream.h
diff --git a/libril/Android.mk b/libril/Android.mk
@@ -5,15 +5,15 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
     ril.cpp \
-    ril_event.cpp \
-    record_stream.c
+    ril_event.cpp
 
 LOCAL_SHARED_LIBRARIES := \
     liblog \
     libutils \
     libbinder \
     libcutils \
-    libhardware_legacy
+    libhardware_legacy \
+    librilutils
 
 LOCAL_CFLAGS :=
 
@@ -30,12 +30,12 @@ ifneq ($(ANDROID_BIONIC_TRANSITION),)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-    ril.cpp \
-    record_stream.c
+    ril.cpp
 
 LOCAL_STATIC_LIBRARIES := \
     libutils_static \
-    libcutils
+    libcutils \
+    librilutils_static
 
 LOCAL_CFLAGS :=
 

diff --git a/libril/ril.cpp b/libril/ril.cpp
@@ -23,7 +23,7 @@
 #include <telephony/ril_cdma_sms.h>
 #include <cutils/sockets.h>
 #include <cutils/jstring.h>
-#include "record_stream.h"
+#include <telephony/record_stream.h>
 #include <utils/Log.h>
 #include <utils/SystemClock.h>
 #include <pthread.h>

diff --git a/librilutils/Android.mk b/librilutils/Android.mk
@@ -4,7 +4,8 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-    librilutils.c
+    librilutils.c \
+    record_stream.c
 
 LOCAL_CFLAGS :=
 
@@ -20,7 +21,8 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-    librilutils.c
+    librilutils.c \
+    record_stream.c
 
 LOCAL_STATIC_LIBRARIES :=
 

diff --git a/libril/record_stream.c → librilutils/record_stream.c b/libril/record_stream.c → librilutils/record_stream.c
@@ -1,4 +1,4 @@
-/* libs/cutils/record_stream.c
+/*
 **
 ** Copyright 2006, The Android Open Source Project
 **
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
-#include "record_stream.h"
+#include <telephony/record_stream.h>
 #include <string.h>
 #include <stdint.h>
 #ifdef HAVE_WINSOCK