Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dacbb9a authored by John Bates's avatar John Bates
Browse files

Add correct header paths to dvr_api.h 

Allows export script to find them for documentation insertion.

Also rename the included dvr_hardware_composer_defs file to
_types to match the copy that is in google3.

Bug: b/38379392
Test: ran export script
Change-Id: I9c9fe40bc1e6cc07739997f143fa036e713487c6
parent 27e0a3d9

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

+3 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <cstdio>



#include <dvr/dvr_display_types.h>

#include <dvr/dvr_hardware_composer_defs.h>

#include <dvr/dvr_hardware_composer_types.h>

#include <dvr/dvr_pose.h>



#ifdef __cplusplus
@@ -199,7 +199,7 @@ typedef int (*DvrVSyncClientGetSchedInfoPtr)(DvrVSyncClient* client, 
                                             int64_t* next_timestamp_ns,

                                             uint32_t* next_vsync_count);



// pose_client.h

// libs/vr/libvrsensor/include/dvr/pose_client.h

typedef DvrPoseClient* (*DvrPoseClientCreatePtr)(void);

typedef void (*DvrPoseClientDestroyPtr)(DvrPoseClient* client);

typedef int (*DvrPoseClientGetPtr)(DvrPoseClient* client, uint32_t vsync_count,
@@ -210,7 +210,7 @@ typedef int (*DvrPoseClientGetControllerPtr)(DvrPoseClient* client, 
                                             uint32_t vsync_count,

                                             DvrPoseAsync* out_pose);



// virtual_touchpad_client.h

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

typedef DvrVirtualTouchpad* (*DvrVirtualTouchpadCreatePtr)(void);

typedef void (*DvrVirtualTouchpadDestroyPtr)(DvrVirtualTouchpad* client);

typedef int (*DvrVirtualTouchpadAttachPtr)(DvrVirtualTouchpad* client);
@@ -325,7 +325,6 @@ struct DvrApi_v1 { 
// Defines an API entry for V1 (no version suffix).

#define DVR_V1_API_ENTRY(name) Dvr##name##Ptr name



// Include file with API entries.

#include "dvr_api_entries.h"



// Undefine macro definitions to play nice with Google3 style rules.

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

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#error Do not include this header directly.

#endif



// Do not delete this line: BEGIN CODEGEN OUTPUT

// Display manager client

DVR_V1_API_ENTRY(DisplayManagerCreate);

DVR_V1_API_ENTRY(DisplayManagerDestroy);

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

+1 −1
Original line number Diff line number Diff line 
#ifndef ANDROID_DVR_HARDWARE_COMPOSER_CLIENT_H

#define ANDROID_DVR_HARDWARE_COMPOSER_CLIENT_H



#include <dvr/dvr_hardware_composer_defs.h>

#include <dvr/dvr_hardware_composer_types.h>

#include <stdbool.h>



#ifdef __cplusplus