diff options
| author | Colin Cross <ccross@android.com> | 2015-12-16 14:15:42 -0800 |
|---|---|---|
| committer | Christopher N. Hesse <raymanfx@gmail.com> | 2016-09-12 13:49:06 -0700 |
| commit | b9e88c8b54ddf102fcc4ad70831c0cfded397ecb (patch) | |
| tree | 3f148b99324703aeecb472573dd16b2708fa942a /ril | |
| parent | e942c33156a7d6444dfc7ec677a5d5de48b7f4a0 (diff) | |
| download | android_hardware_samsung-b9e88c8b54ddf102fcc4ad70831c0cfded397ecb.tar.gz android_hardware_samsung-b9e88c8b54ddf102fcc4ad70831c0cfded397ecb.tar.bz2 android_hardware_samsung-b9e88c8b54ddf102fcc4ad70831c0cfded397ecb.zip | |
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
Diffstat (limited to 'ril')
| -rw-r--r-- | ril/include/libril/ril_ex.h (renamed from ril/libril/ril_ex.h) | 0 | ||||
| -rw-r--r-- | ril/libril/Android.mk | 3 | ||||
| -rw-r--r-- | ril/libril/RilSocket.h | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/ril/libril/ril_ex.h b/ril/include/libril/ril_ex.h index 8e15d65..8e15d65 100644 --- a/ril/libril/ril_ex.h +++ b/ril/include/libril/ril_ex.h diff --git a/ril/libril/Android.mk b/ril/libril/Android.mk index 4330178..4651122 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 1539c11..619401a 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> |