libutils: export system_headers

vendor + vendor_available modules built with BOARD_VNDK_VERSION :=
current aren't allowed to use global headers. Since libutils uses
system headers itself, it should export them as well.

Also added some items into windows-deprecated.h. This file is supposed
to be in sync with the libnativewindow variant until all dependencies on
it can be fixed. However, it is missing some updates. This matters when
including libsystem_headers adds system headers before libnativewindow
headers in the lookup paths.

Bug: 33241851
Test: building with BOARD_VNDK_VERSION := current produces many fewer
errors.

Change-Id: I950821f1dae3ddc110db50869247913d5b1aa638
This commit is contained in:
Steven Moreland 2017-04-12 18:57:57 -07:00
parent bed3cbd8ac
commit b084bc3545
3 changed files with 35 additions and 2 deletions

View File

@ -1,4 +1,15 @@
cc_library_headers {
name: "libsystem_headers",
vendor_available: true,
host_supported: true,
export_include_dirs: ["include"],
target: {
linux_bionic: {
enabled: true,
},
windows: {
enabled: true,
},
}
}

View File

@ -32,6 +32,8 @@
**************************************************************************************************
**************************************************************************************************/
#pragma once
#include <cutils/native_handle.h>
#include <errno.h>
#include <limits.h>
@ -326,6 +328,12 @@ enum {
* if it is safe (i.e. no crash will occur) to call any method on it.
*/
NATIVE_WINDOW_IS_VALID = 17,
/*
* Returns 1 if NATIVE_WINDOW_GET_FRAME_TIMESTAMPS will return display
* present info, 0 if it won't.
*/
NATIVE_WINDOW_FRAME_TIMESTAMPS_SUPPORTS_PRESENT = 18,
};
/* Valid operations for the (*perform)() hook.
@ -445,6 +453,14 @@ enum {
*/
static const int64_t NATIVE_WINDOW_TIMESTAMP_AUTO = (-9223372036854775807LL-1);
/* parameter for NATIVE_WINDOW_GET_FRAME_TIMESTAMPS
*
* Special timestamp value to indicate the timestamps aren't yet known or
* that they are invalid.
*/
static const int64_t NATIVE_WINDOW_TIMESTAMP_PENDING = -2;
static const int64_t NATIVE_WINDOW_TIMESTAMP_INVALID = -1;
struct ANativeWindow
{
#ifdef __cplusplus

View File

@ -58,8 +58,14 @@ cc_library {
cflags: ["-Werror"],
include_dirs: ["external/safe-iop/include"],
header_libs: ["libutils_headers"],
export_header_lib_headers: ["libutils_headers"],
header_libs: [
"libsystem_headers",
"libutils_headers",
],
export_header_lib_headers: [
"libsystem_headers",
"libutils_headers",
],
arch: {
mips: {