resolved conflicts for ba95966e to stage-aosp-master

[android-x86/hardware-ril.git] / librilutils / Android.mk

diff --git a/librilutils/Android.mk b/librilutils/Android.mk
index 1ac00e0..455f9bc 100644 (file)
--- a/librilutils/Android.mk
+++ b/librilutils/Android.mk
@@ -8,12 +8,14 @@ LOCAL_SRC_FILES:= \
     record_stream.c \
     proto/sap-api.proto \
 
-LOCAL_C_INCLUDES += external/nanopb-c/ \
+LOCAL_C_INCLUDES += \
+    external/nanopb-c/ \
+    $(LOCAL_PATH)/../include
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+    $(LOCAL_PATH)/../include
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
 
-LOCAL_CFLAGS :=
-
 LOCAL_MODULE:= librilutils
 
 include $(BUILD_SHARED_LIBRARY)
@@ -28,12 +30,14 @@ LOCAL_SRC_FILES:= \
     record_stream.c \
     proto/sap-api.proto \
 
-LOCAL_C_INCLUDES += external/nanopb-c/ \
+LOCAL_C_INCLUDES += \
+    external/nanopb-c/ \
+    $(LOCAL_PATH)/../include
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+    $(LOCAL_PATH)/../include
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nanopb-c-enable_malloc
 
-LOCAL_CFLAGS :=
-
 LOCAL_MODULE:= librilutils_static
 
 include $(BUILD_STATIC_LIBRARY)