Snap for 6439596 from cffbeaf2db40ac50eccbdd863632f67cc8ed2b06 to qt-aml-tzdata-release
Change-Id: I3ceca95e6f220559c986a9fb44a2bc9a3511aaa2
diff --git a/OWNERS b/OWNERS
index 4819e84..2d29dd3 100644
--- a/OWNERS
+++ b/OWNERS
@@ -6,4 +6,3 @@
mpq@google.com
shuoq@google.com
refuhoo@google.com
-sarahchin@google.com
\ No newline at end of file
diff --git a/libril/Android.mk b/libril/Android.mk
index 87319bf..a7735d2 100644
--- a/libril/Android.mk
+++ b/libril/Android.mk
@@ -21,7 +21,9 @@
android.hardware.radio@1.0 \
android.hardware.radio@1.1 \
android.hardware.radio.deprecated@1.0 \
- libhidlbase \
+ libhidlbase \
+ libhidltransport \
+ libhwbinder
LOCAL_STATIC_LIBRARIES := \
libprotobuf-c-nano-enable_malloc-32bit \
diff --git a/libril/ril.cpp b/libril/ril.cpp
index 214fa10..fbf7ee0 100644
--- a/libril/ril.cpp
+++ b/libril/ril.cpp
@@ -21,10 +21,12 @@
#include <telephony/ril.h>
#include <telephony/ril_cdma_sms.h>
#include <cutils/sockets.h>
+#include <cutils/jstring.h>
#include <telephony/record_stream.h>
#include <utils/Log.h>
#include <utils/SystemClock.h>
#include <pthread.h>
+#include <cutils/jstring.h>
#include <sys/types.h>
#include <sys/limits.h>
#include <sys/system_properties.h>
