Use C-style symbols where needed for aemu.
Bug: 224794781
Test: presubmit
Change-Id: I1288af48491448ae0bd930589c39a09f26808ffd
diff --git a/host-common/include/host-common/feature_control.h b/host-common/include/host-common/feature_control.h
index d83a300..2458c26 100644
--- a/host-common/include/host-common/feature_control.h
+++ b/host-common/include/host-common/feature_control.h
@@ -18,6 +18,10 @@
#include <stdbool.h>
+#include "base/c_header.h"
+
+ANDROID_BEGIN_HEADER
+
typedef enum {
#define FEATURE_CONTROL_ITEM(item) kFeature_##item,
#include "FeatureControlDefHost.h"
@@ -44,3 +48,5 @@
// asyncUpdateServerFeaturePatterns. See FeatureControl.h
// for more info. To be called only once on startup.
void feature_update_from_server();
+
+ANDROID_END_HEADER
diff --git a/host-common/include/host-common/opengl/emugl_config.h b/host-common/include/host-common/opengl/emugl_config.h
index e37a34c..873b1dd 100644
--- a/host-common/include/host-common/opengl/emugl_config.h
+++ b/host-common/include/host-common/opengl/emugl_config.h
@@ -14,11 +14,14 @@
#pragma once
+#include "base/c_header.h"
#include "base/export.h"
// #include "android/skin/winsys.h"
#include <stdbool.h>
+ANDROID_BEGIN_HEADER
+
// List of values describing how EGL/GLES emulation should work in a given
// Android virtual device.
//
@@ -144,3 +147,5 @@
// Setup GPU emulation according to a given |backend|.
// |bitness| is the host bitness, and can be 0 (autodetect), 32 or 64.
AEMU_EXPORT void emuglConfig_setupEnv(const EmuglConfig* config);
+
+ANDROID_END_HEADER
diff --git a/host-common/include/host-common/opengles-pipe.h b/host-common/include/host-common/opengles-pipe.h
index 9278391..7c99304 100644
--- a/host-common/include/host-common/opengles-pipe.h
+++ b/host-common/include/host-common/opengles-pipe.h
@@ -16,8 +16,11 @@
#pragma once
+#include "base/c_header.h"
#include "base/export.h"
+ANDROID_BEGIN_HEADER
+
// Initialize the 'opengles' pipe - the one used for GPU emulation protocol
// between guest and the emugl library.
// |dummyLooper| is now unused, this will be removed in a future patch.
@@ -27,3 +30,5 @@
// 0: Android
// 1: Fuchsia
AEMU_EXPORT void android_opengles_pipe_set_recv_mode(int);
+
+ANDROID_END_HEADER
diff --git a/host-common/include/host-common/opengles.h b/host-common/include/host-common/opengles.h
index 249cdac..78b0cd2 100644
--- a/host-common/include/host-common/opengles.h
+++ b/host-common/include/host-common/opengles.h
@@ -16,6 +16,7 @@
#include <stddef.h>
+#include "base/c_header.h"
#include "base/export.h"
#include "host-common/multi_display_agent.h"
#include "host-common/vm_operations.h"
@@ -23,6 +24,10 @@
#include "../stream-servers/virtio_gpu_ops.h"
#include "../stream-servers/RenderLib.h"
+#ifndef USING_ANDROID_BP
+ANDROID_BEGIN_HEADER
+#endif
+
/* A version of android_initOpenglesEmulation that is called from a library
* that has static access to libOpenglRender. */
AEMU_EXPORT int android_prepareOpenglesEmulation(void);
@@ -142,3 +147,7 @@
/* Get EGL/GLESv2 dispatch tables */
AEMU_EXPORT const void* android_getEGLDispatch();
AEMU_EXPORT const void* android_getGLESv2Dispatch();
+
+#ifndef USING_ANDROID_BP
+ANDROID_END_HEADER
+#endif
diff --git a/host-common/include/host-common/refcount-pipe.h b/host-common/include/host-common/refcount-pipe.h
index f86ada2..d468ae1 100644
--- a/host-common/include/host-common/refcount-pipe.h
+++ b/host-common/include/host-common/refcount-pipe.h
@@ -14,7 +14,12 @@
#pragma once
+#include "base/c_header.h"
#include "base/export.h"
+ANDROID_BEGIN_HEADER
+
// Initialize the 'refcount' pipe.
AEMU_EXPORT void android_init_refcount_pipe(void);
+
+ANDROID_END_HEADER
