From b9e88c8b54ddf102fcc4ad70831c0cfded397ecb Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 16 Dec 2015 14:15:42 -0800
Subject: [PATCH] Properly export ril_ex.h

Copying headers makes fixing compile errors hard, and breaks dependency
restrictions.  Move ril_ex.h to an exported include directory instead of
copying it.

Bug: 18903857
Change-Id: I4b59a01e442db0d3198def69a5a5ff17b2a41c66
---
 ril/{ => include}/libril/ril_ex.h | 0
 ril/libril/Android.mk             | 3 ---
 ril/libril/RilSocket.h            | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)
 rename ril/{ => include}/libril/ril_ex.h (100%)

diff --git a/ril/libril/ril_ex.h b/ril/include/libril/ril_ex.h
similarity index 100%
rename from ril/libril/ril_ex.h
rename to ril/include/libril/ril_ex.h
diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk
index 4330178e..4651122d 100644
--- a/ril/libril/Android.mk
+++ b/ril/libril/Android.mk
@@ -43,9 +43,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include
 
 LOCAL_MODULE:= libril
 
-LOCAL_COPY_HEADERS_TO := libril
-LOCAL_COPY_HEADERS := ril_ex.h
-
 include $(BUILD_SHARED_LIBRARY)
 
 # For RdoServD which needs a static library
diff --git a/ril/libril/RilSocket.h b/ril/libril/RilSocket.h
index 1539c115..619401af 100644
--- a/ril/libril/RilSocket.h
+++ b/ril/libril/RilSocket.h
@@ -16,7 +16,7 @@
 
 #ifndef RIL_SOCKET_H_INCLUDED
 #define RIL_SOCKET_H_INCLUDED
-#include "ril_ex.h"
+#include <libril/ril_ex.h>
 #include "rilSocketQueue.h"
 #include <ril_event.h>