diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-09-28 14:33:14 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-09-28 14:33:14 -0700 |
| commit | 3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66 (patch) | |
| tree | bea6a7467c9ad110681eaac37537f72bb44888c7 /libril/Android.mk | |
| parent | 536a38fe3317047e9b51813a04ae3a74c3df5d60 (diff) | |
| parent | ba95966e8bb579cdef665901617b76eadddb0ed9 (diff) | |
| download | android_hardware_ril-3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66.tar.gz android_hardware_ril-3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66.tar.bz2 android_hardware_ril-3cf0775dd1233eb52f3ff21ddff0a5e5e6631d66.zip | |
resolved conflicts for ba95966e to stage-aosp-master
Change-Id: Id468b025222853e5a421300b6e669de999bf737e
Diffstat (limited to 'libril/Android.mk')
| -rw-r--r-- | libril/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libril/Android.mk b/libril/Android.mk index 3f1d3e8..696051e 100644 --- a/libril/Android.mk +++ b/libril/Android.mk @@ -28,6 +28,8 @@ endif LOCAL_C_INCLUDES += $(TARGET_OUT_HEADER)/librilutils LOCAL_C_INCLUDES += external/nanopb-c +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include LOCAL_MODULE:= libril |