Merge tag 'android-11.0.0_r48' into int/11/fp3
Android 11.0.0 Release 48 (RD2A.211001.002)
* tag 'android-11.0.0_r48':
Change-Id: If976a04d959a4a4efd653dea6fb36148499343d5
diff --git a/Android.bp b/Android.bp
index 0ed5898..a26a724 100644
--- a/Android.bp
+++ b/Android.bp
@@ -172,6 +172,9 @@
vendor: true,
export_include_dirs: [
"external/flatbuffers/include",
+ "host/common/include",
+ "platform/shared/include",
+ "util/include",
],
}
diff --git a/host/msm/daemon/chre_daemon.cc b/host/msm/daemon/chre_daemon.cc
index f4b7210..d37c06b 100644
--- a/host/msm/daemon/chre_daemon.cc
+++ b/host/msm/daemon/chre_daemon.cc
@@ -53,11 +53,18 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-
#include <fstream>
#include <queue>
#include <string>
+#ifdef REMOTE_HANDLE_SPD
+extern "C" {
+#include "remote.h"
+} // extern C
+
+#define ITRANSPORT_PREFIX "'\":;./\\"
+#endif
+
#include "chre/platform/slpi/fastrpc.h"
#include "chre_host/host_protocol_host.h"
#include "chre_host/log.h"