diff options
| author | Steven Moreland <smoreland@google.com> | 2017-04-14 02:04:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-14 02:04:43 +0000 |
| commit | 5c75fd4b4f4e800cc8dd6de84ad951a77d3f4b96 (patch) | |
| tree | 53ca4ab4ce0ff2ead1d879b51f4361cceed536ad /libsystem | |
| parent | 471c3eb6c120d9c2e905ae9f7f0a4aa16cfe5b8c (diff) | |
| parent | 220e6d824c2978f0d81a0ccf1a999acbf0e24d36 (diff) | |
| download | system_core-5c75fd4b4f4e800cc8dd6de84ad951a77d3f4b96.tar.gz system_core-5c75fd4b4f4e800cc8dd6de84ad951a77d3f4b96.tar.bz2 system_core-5c75fd4b4f4e800cc8dd6de84ad951a77d3f4b96.zip | |
Merge "libutils: export system_headers" into oc-dev am: e003513ccf
am: 220e6d824c
Change-Id: Ide0ddea7fc3bf2b1a0c46df7dd0d0704c36fc237
Diffstat (limited to 'libsystem')
| -rw-r--r-- | libsystem/Android.bp | 11 | ||||
| -rw-r--r-- | libsystem/include/system/window-deprecated.h | 16 |
2 files changed, 27 insertions, 0 deletions
diff --git a/libsystem/Android.bp b/libsystem/Android.bp index 4d076d538..846a58526 100644 --- a/libsystem/Android.bp +++ b/libsystem/Android.bp @@ -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, + }, + } } diff --git a/libsystem/include/system/window-deprecated.h b/libsystem/include/system/window-deprecated.h index d1ef1e7dc..2ccfd66f0 100644 --- a/libsystem/include/system/window-deprecated.h +++ b/libsystem/include/system/window-deprecated.h @@ -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 |