Merge "Cleanup dvr api headers for exporting" (a1ed1689) · Commits · e / os / android_frameworks_native

libs/vr/libdvr/include/dvr/dvr_api.h

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -211,7 +211,7 @@ typedef int (DvrVSyncClientGetSchedInfoPtr)(DvrVSyncClient client,
	uint32_t* next_vsync_count);		uint32_t* next_vsync_count);

	// libs/vr/libvrsensor/include/dvr/pose_client.h		// libs/vr/libvrsensor/include/dvr/pose_client.h
	typedef DvrPoseClient* (*DvrPoseClientCreatePtr)(void);		typedef DvrPoseClient* (*DvrPoseClientCreatePtr)();
	typedef void (DvrPoseClientDestroyPtr)(DvrPoseClient client);		typedef void (DvrPoseClientDestroyPtr)(DvrPoseClient client);
	typedef int (DvrPoseClientGetPtr)(DvrPoseClient client, uint32_t vsync_count,		typedef int (DvrPoseClientGetPtr)(DvrPoseClient client, uint32_t vsync_count,
	DvrPoseAsync* out_pose);		DvrPoseAsync* out_pose);
	@@ -222,7 +222,13 @@ typedef int (DvrPoseClientGetControllerPtr)(DvrPoseClient client,
	DvrPoseAsync* out_pose);		DvrPoseAsync* out_pose);

	// services/vr/virtual_touchpad/include/dvr/virtual_touchpad_client.h		// services/vr/virtual_touchpad/include/dvr/virtual_touchpad_client.h
	typedef DvrVirtualTouchpad* (*DvrVirtualTouchpadCreatePtr)(void);
			// Touchpad IDs for Touch() and ButtonState() calls.
			enum {
			DVR_VIRTUAL_TOUCHPAD_PRIMARY = 0,
			DVR_VIRTUAL_TOUCHPAD_VIRTUAL = 1,
			};
			typedef DvrVirtualTouchpad* (*DvrVirtualTouchpadCreatePtr)();
	typedef void (DvrVirtualTouchpadDestroyPtr)(DvrVirtualTouchpad client);		typedef void (DvrVirtualTouchpadDestroyPtr)(DvrVirtualTouchpad client);
	typedef int (DvrVirtualTouchpadAttachPtr)(DvrVirtualTouchpad client);		typedef int (DvrVirtualTouchpadAttachPtr)(DvrVirtualTouchpad client);
	typedef int (DvrVirtualTouchpadDetachPtr)(DvrVirtualTouchpad client);		typedef int (DvrVirtualTouchpadDetachPtr)(DvrVirtualTouchpad client);

libs/vr/libdvr/include/dvr/dvr_display_manager.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,7 @@ int dvrSurfaceStateGetSurfaceCount(DvrSurfaceState* surface_state,
	size_t* count_out);		size_t* count_out);

	// Returns the update flags for the surface at \|surface_index\| in the state		// Returns the update flags for the surface at \|surface_index\| in the state
	// object. The flags may be used to determine what changes, if any, occured to		// object. The flags may be used to determine what changes, if any, occurred to
	// the surface since the last state update.		// the surface since the last state update.
	// @return 0 on success. Otherwise returns a negative error value.		// @return 0 on success. Otherwise returns a negative error value.
	int dvrSurfaceStateGetUpdateFlags(DvrSurfaceState* surface_state,		int dvrSurfaceStateGetUpdateFlags(DvrSurfaceState* surface_state,

services/vr/virtual_touchpad/Android.bp

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -13,10 +13,15 @@ shared_libs = [
	"libutils",		"libutils",
	]		]

			header_libraries = [
			"libdvr_headers"
			]

	cc_library {		cc_library {
	srcs: src,		srcs: src,
	export_include_dirs: ["include"],		export_include_dirs: ["include"],
	shared_libs: shared_libs,		shared_libs: shared_libs,
			header_libs: header_libraries,
	cppflags: ["-std=c++11"],		cppflags: ["-std=c++11"],
	cflags: ["-DLOG_TAG=\"VrVirtualTouchpad\""],		cflags: ["-DLOG_TAG=\"VrVirtualTouchpad\""],
	name: "libvirtualtouchpad",		name: "libvirtualtouchpad",
	@@ -42,6 +47,7 @@ cc_test {
	srcs: test_src_files,		srcs: test_src_files,
	static_libs: test_static_libs,		static_libs: test_static_libs,
	shared_libs: test_shared_libs,		shared_libs: test_shared_libs,
			header_libs: header_libraries,
	cppflags = [		cppflags = [
	"-std=c++11",		"-std=c++11",
	],		],
	@@ -77,6 +83,7 @@ cc_binary {
	srcs: service_src,		srcs: service_src,
	static_libs: service_static_libs,		static_libs: service_static_libs,
	shared_libs: service_shared_libs,		shared_libs: service_shared_libs,
			header_libs: header_libraries,
	cppflags: ["-std=c++11"],		cppflags: ["-std=c++11"],
	cflags: [		cflags: [
	"-DLOG_TAG=\"VrVirtualTouchpad\"",		"-DLOG_TAG=\"VrVirtualTouchpad\"",
	@@ -107,6 +114,7 @@ client_shared_libs = [
	cc_library {		cc_library {
	srcs: client_src,		srcs: client_src,
	shared_libs: client_shared_libs,		shared_libs: client_shared_libs,
			header_libs: header_libraries,
	cppflags: ["-std=c++11"],		cppflags: ["-std=c++11"],
	cflags: ["-DLOG_TAG=\"VirtualTouchpadClient\""],		cflags: ["-DLOG_TAG=\"VirtualTouchpadClient\""],
	host_ldlibs: ["-llog"],		host_ldlibs: ["-llog"],

services/vr/virtual_touchpad/include/dvr/virtual_touchpad_client.h

+2 −5

Original line number	Original line	Diff line number	Diff line
	#ifndef ANDROID_DVR_VIRTUAL_TOUCHPAD_C_CLIENT_H		#ifndef ANDROID_DVR_VIRTUAL_TOUCHPAD_C_CLIENT_H
	#define ANDROID_DVR_VIRTUAL_TOUCHPAD_C_CLIENT_H		#define ANDROID_DVR_VIRTUAL_TOUCHPAD_C_CLIENT_H

			#include <dvr/dvr_api.h>

	#ifdef __cplusplus		#ifdef __cplusplus
	extern "C" {		extern "C" {
	#endif		#endif

	typedef struct DvrVirtualTouchpad DvrVirtualTouchpad;		typedef struct DvrVirtualTouchpad DvrVirtualTouchpad;

	enum {
	DVR_VIRTUAL_TOUCHPAD_PRIMARY = 0,
	DVR_VIRTUAL_TOUCHPAD_VIRTUAL = 1,
	};

	// Creates a new virtual touchpad client.		// Creates a new virtual touchpad client.
	//		//
	// @return Pointer to the created virtual touchpad client; nullptr on failure.		// @return Pointer to the created virtual touchpad client; nullptr on failure.