Use local copy of ril.h for reference-ril and mock-ril.
This allows for greater stability while we're changing the ril
interface, as defined by ril.h. An example is that the emulator
will continue to run using an older ril while we upgrade to
newer rils.
After the new ril has stabilized and these modules updated the
changes should be reverted and we should use
include/telephony/ril.h
Change-Id: If5011ccbe64bcb65f98b02060165f899b6d4b5f9
diff --git a/mock-ril/src/cpp/experiments.cpp b/mock-ril/src/cpp/experiments.cpp
index b6bda08..5fa6fec 100644
--- a/mock-ril/src/cpp/experiments.cpp
+++ b/mock-ril/src/cpp/experiments.cpp
@@ -15,7 +15,7 @@
*/
#include <v8.h>
-#include <telephony/ril.h>
+#include "ril.h"
#include "logging.h"
#include "status.h"
diff --git a/mock-ril/src/cpp/js_support.cpp b/mock-ril/src/cpp/js_support.cpp
index 9497176..a2ce9c5 100644
--- a/mock-ril/src/cpp/js_support.cpp
+++ b/mock-ril/src/cpp/js_support.cpp
@@ -15,7 +15,7 @@
*/
#include <v8.h>
-#include <telephony/ril.h>
+#include "ril.h"
#include "ctrl_server.h"
#include "logging.h"
diff --git a/mock-ril/src/cpp/js_support.h b/mock-ril/src/cpp/js_support.h
index 6c70b82..3116f1d 100644
--- a/mock-ril/src/cpp/js_support.h
+++ b/mock-ril/src/cpp/js_support.h
@@ -18,7 +18,7 @@
#define MOCK_RIL_JS_SUPPORT_H_
#include <v8.h>
-#include <telephony/ril.h>
+#include "ril.h"
// The global value of radio state shared between cpp and js code.
extern RIL_RadioState gRadioState;
diff --git a/mock-ril/src/cpp/mock_ril.cpp b/mock-ril/src/cpp/mock_ril.cpp
index b8fa69e..f6b6807 100644
--- a/mock-ril/src/cpp/mock_ril.cpp
+++ b/mock-ril/src/cpp/mock_ril.cpp
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-#include <telephony/ril.h>
#include <stdio.h>
#include <assert.h>
#include <string.h>
@@ -31,6 +30,7 @@
#include <termios.h>
#include <v8.h>
+#include "ril.h"
#include "hardware/ril/mock-ril/src/proto/ril.pb.h"
diff --git a/mock-ril/src/cpp/mock_ril.h b/mock-ril/src/cpp/mock_ril.h
index c29b5ed..38745d6 100644
--- a/mock-ril/src/cpp/mock_ril.h
+++ b/mock-ril/src/cpp/mock_ril.h
@@ -17,7 +17,7 @@
#ifndef MOCK_RIL_MOCK_RIL_H_
#define MOCK_RIL_MOCK_RIL_H_
-#include <telephony/ril.h>
+#include "ril.h"
extern const struct RIL_Env *s_rilenv;
diff --git a/mock-ril/src/cpp/requests.cpp b/mock-ril/src/cpp/requests.cpp
index acc4fc4..6ba9632 100644
--- a/mock-ril/src/cpp/requests.cpp
+++ b/mock-ril/src/cpp/requests.cpp
@@ -17,7 +17,7 @@
#include <map>
#include <v8.h>
-#include <telephony/ril.h>
+#include "ril.h"
#include "hardware/ril/mock-ril/src/proto/ril.pb.h"
diff --git a/mock-ril/src/cpp/responses.cpp b/mock-ril/src/cpp/responses.cpp
index c3b11a9..a2d5947 100644
--- a/mock-ril/src/cpp/responses.cpp
+++ b/mock-ril/src/cpp/responses.cpp
@@ -17,7 +17,7 @@
#include <map>
#include <v8.h>
-#include <telephony/ril.h>
+#include "ril.h"
#include "hardware/ril/mock-ril/src/proto/ril.pb.h"