graphics_Gralloc: eliminate sw_sync.h
We should try to avoid using this when possible, since it's for
testing purposes only and upstream may not support it.
BUG=b:62069164
TEST=./gralloctest all passes
Change-Id: I2cb64d77a927fd0530cc5774c7863bb13a0ca2da
Reviewed-on: https://chromium-review.googlesource.com/549478
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
diff --git a/client/site_tests/graphics_Gralloc/src/gralloctest.c b/client/site_tests/graphics_Gralloc/src/gralloctest.c
index cb7e782..303aa8d 100644
--- a/client/site_tests/graphics_Gralloc/src/gralloctest.c
+++ b/client/site_tests/graphics_Gralloc/src/gralloctest.c
@@ -18,8 +18,7 @@
#include <cutils/native_handle.h>
#include <hardware/gralloc.h>
#include <system/graphics.h>
-
-#include "sw_sync.h"
+#include <sync/sync.h>
#define ALIGN(A, B) (((A) + (B)-1) / (B) * (B))
#define ARRAY_SIZE(A) (sizeof(A) / sizeof(*(A)))
diff --git a/client/site_tests/graphics_Gralloc/src/sw_sync.h b/client/site_tests/graphics_Gralloc/src/sw_sync.h
deleted file mode 100644
index c33bb13..0000000
--- a/client/site_tests/graphics_Gralloc/src/sw_sync.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * sw_sync.h
- *
- * Copyright 2013 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_SW_SYNC_H
-#define __SYS_CORE_SW_SYNC_H
-
-__BEGIN_DECLS
-
-/*
- * sw_sync is mainly intended for testing and should not be compiled into
- * production kernels
- */
-
-int sw_sync_timeline_create(void);
-int sw_sync_timeline_inc(int fd, unsigned count);
-int sw_sync_fence_create(int fd, const char *name, unsigned value);
-int sync_wait(int fd, int timeout);
-
-__END_DECLS
-
-#endif /* __SYS_CORE_SW_SYNC_H */
