diff options
author | Jesse Hall <jessehall@google.com> | 2017-02-13 15:19:24 -0800 |
---|---|---|
committer | Jesse Hall <jessehall@google.com> | 2017-02-23 18:44:50 -0800 |
commit | 41129a2526d4a8bc3510bc65c0e39e1e9d4700d2 (patch) | |
tree | 2e0ffa0c4c47072e77e8214c53d223078907ce64 /libsync | |
parent | b7fdb2a1284143b8cee11483646b8753262ad165 (diff) | |
download | system_core-41129a2526d4a8bc3510bc65c0e39e1e9d4700d2.tar.gz system_core-41129a2526d4a8bc3510bc65c0e39e1e9d4700d2.tar.bz2 system_core-41129a2526d4a8bc3510bc65c0e39e1e9d4700d2.zip |
sync: rename sync/sync.h to android/sync.h
Leave a temporary symlink from the old name to avoid having to change
all dependencies simultaneously.
Bug: 1901466
Test: m
Change-Id: Id210f0091457e52e1a6e048d241a723bdbe8779b
Diffstat (limited to 'libsync')
-rw-r--r-- | libsync/include/android/sync.h | 69 | ||||
l---------[-rw-r--r--] | libsync/include/sync/sync.h | 63 | ||||
-rw-r--r-- | libsync/sync.c | 2 | ||||
-rw-r--r-- | libsync/sync_test.c | 2 | ||||
-rw-r--r-- | libsync/tests/sync_test.cpp | 2 |
5 files changed, 73 insertions, 65 deletions
diff --git a/libsync/include/android/sync.h b/libsync/include/android/sync.h new file mode 100644 index 000000000..68f74a0b2 --- /dev/null +++ b/libsync/include/android/sync.h @@ -0,0 +1,69 @@ +/* + * sync.h + * + * Copyright 2012 Google, Inc + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __SYS_CORE_SYNC_H +#define __SYS_CORE_SYNC_H + +/* This file contains the legacy sync interface used by Android platform and + * device code. The direct contents will be removed over time as code + * transitions to using the updated interface in ndk/sync.h. When this file is + * empty other than the ndk/sync.h include, that file will be renamed to + * replace this one. + * + * New code should continue to include this file (#include <android/sync.h>) + * instead of ndk/sync.h so the eventual rename is seamless, but should only + * use the things declared in ndk/sync.h. + * + * This file used to be called sync/sync.h, but we renamed to that both the + * platform and NDK call it android/sync.h. A symlink from the old name to this + * one exists temporarily to avoid having to change all sync clients + * simultaneously. It will be removed when they've been updated, and probably + * after this change has been delivered to AOSP so that integrations don't + * break builds. + */ + +#include "../ndk/sync.h" + +__BEGIN_DECLS + +struct sync_fence_info_data { + uint32_t len; + char name[32]; + int32_t status; + uint8_t pt_info[0]; +}; + +struct sync_pt_info { + uint32_t len; + char obj_name[32]; + char driver_name[32]; + int32_t status; + uint64_t timestamp_ns; + uint8_t driver_data[0]; +}; + +/* timeout in msecs */ +int sync_wait(int fd, int timeout); +struct sync_fence_info_data *sync_fence_info(int fd); +struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info, + struct sync_pt_info *itr); +void sync_fence_info_free(struct sync_fence_info_data *info); + +__END_DECLS + +#endif /* __SYS_CORE_SYNC_H */ diff --git a/libsync/include/sync/sync.h b/libsync/include/sync/sync.h index d29ed8541..3b17e480a 100644..120000 --- a/libsync/include/sync/sync.h +++ b/libsync/include/sync/sync.h @@ -1,62 +1 @@ -/* - * sync.h - * - * Copyright 2012 Google, Inc - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __SYS_CORE_SYNC_H -#define __SYS_CORE_SYNC_H - -/* This file contains the legacy sync interface used by Android platform and - * device code. The direct contents will be removed over time as code - * transitions to using the updated interface in ndk/sync.h. When this file is - * empty other than the ndk/sync.h include, that file will be renamed to - * replace this one. - * - * New code should continue to include this file (#include <sync/sync.h>) - * instead of ndk/sync.h so the eventual rename is seamless, but should only - * use the things declared in ndk/sync.h. - */ - -#include "../ndk/sync.h" - -__BEGIN_DECLS - -struct sync_fence_info_data { - uint32_t len; - char name[32]; - int32_t status; - uint8_t pt_info[0]; -}; - -struct sync_pt_info { - uint32_t len; - char obj_name[32]; - char driver_name[32]; - int32_t status; - uint64_t timestamp_ns; - uint8_t driver_data[0]; -}; - -/* timeout in msecs */ -int sync_wait(int fd, int timeout); -struct sync_fence_info_data *sync_fence_info(int fd); -struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info, - struct sync_pt_info *itr); -void sync_fence_info_free(struct sync_fence_info_data *info); - -__END_DECLS - -#endif /* __SYS_CORE_SYNC_H */ +../android/sync.h
\ No newline at end of file diff --git a/libsync/sync.c b/libsync/sync.c index e68cc899d..27dab832f 100644 --- a/libsync/sync.c +++ b/libsync/sync.c @@ -27,7 +27,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include <sync/sync.h> +#include <android/sync.h> /* Legacy Sync API */ diff --git a/libsync/sync_test.c b/libsync/sync_test.c index 9a5f7d858..f1ffdcf9e 100644 --- a/libsync/sync_test.c +++ b/libsync/sync_test.c @@ -22,7 +22,7 @@ #include <string.h> #include <unistd.h> -#include <sync/sync.h> +#include <android/sync.h> #include "sw_sync.h" pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/libsync/tests/sync_test.cpp b/libsync/tests/sync_test.cpp index 7770fcb3a..f08e97e2c 100644 --- a/libsync/tests/sync_test.cpp +++ b/libsync/tests/sync_test.cpp @@ -1,5 +1,5 @@ #include <gtest/gtest.h> -#include <sync/sync.h> +#include <android/sync.h> #include <sw_sync.h> #include <fcntl.h> #include <vector> |