diff options
author | Rom Lemarchand | 2014-01-02 21:31:53 -0600 |
---|---|---|
committer | Rom Lemarchand | 2014-01-03 15:27:05 -0600 |
commit | ddc20de1483028ee0b4401266499a59631e9d659 (patch) | |
tree | afe715bfbf684fcb3fe9c38b490eb80c857329f6 | |
parent | f5447b0eb9cd2157f4935477f05d4c92dcda37c8 (diff) | |
download | platform-system-core-ddc20de1483028ee0b4401266499a59631e9d659.tar.gz platform-system-core-ddc20de1483028ee0b4401266499a59631e9d659.tar.xz platform-system-core-ddc20de1483028ee0b4401266499a59631e9d659.zip |
move sync headers from include to libsync
Make sw_sync.h private
Change-Id: I0b120ebe81fd4a191b7aa4b6a8de4f64d16e2b3e
-rw-r--r-- | include/system/window.h | 1 | ||||
-rw-r--r-- | libsync/Android.mk | 3 | ||||
-rw-r--r-- | libsync/include/sync/sync.h (renamed from include/sync/sync.h) | 0 | ||||
-rw-r--r-- | libsync/sw_sync.h (renamed from include/sync/sw_sync.h) | 2 | ||||
-rw-r--r-- | libsync/sync_test.c | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/include/system/window.h b/include/system/window.h index 649bd71fd..588f9c674 100644 --- a/include/system/window.h +++ b/include/system/window.h | |||
@@ -22,7 +22,6 @@ | |||
22 | #include <limits.h> | 22 | #include <limits.h> |
23 | #include <stdint.h> | 23 | #include <stdint.h> |
24 | #include <string.h> | 24 | #include <string.h> |
25 | #include <sync/sync.h> | ||
26 | #include <sys/cdefs.h> | 25 | #include <sys/cdefs.h> |
27 | #include <system/graphics.h> | 26 | #include <system/graphics.h> |
28 | #include <unistd.h> | 27 | #include <unistd.h> |
diff --git a/libsync/Android.mk b/libsync/Android.mk index 73de06998..626b76273 100644 --- a/libsync/Android.mk +++ b/libsync/Android.mk | |||
@@ -5,6 +5,8 @@ LOCAL_SRC_FILES := sync.c | |||
5 | LOCAL_MODULE := libsync | 5 | LOCAL_MODULE := libsync |
6 | LOCAL_MODULE_TAGS := optional | 6 | LOCAL_MODULE_TAGS := optional |
7 | LOCAL_SHARED_LIBRARIES := liblog | 7 | LOCAL_SHARED_LIBRARIES := liblog |
8 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | ||
9 | LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include | ||
8 | include $(BUILD_SHARED_LIBRARY) | 10 | include $(BUILD_SHARED_LIBRARY) |
9 | 11 | ||
10 | include $(CLEAR_VARS) | 12 | include $(CLEAR_VARS) |
@@ -12,4 +14,5 @@ LOCAL_SRC_FILES := sync.c sync_test.c | |||
12 | LOCAL_MODULE := sync_test | 14 | LOCAL_MODULE := sync_test |
13 | LOCAL_MODULE_TAGS := optional tests | 15 | LOCAL_MODULE_TAGS := optional tests |
14 | LOCAL_SHARED_LIBRARIES := liblog | 16 | LOCAL_SHARED_LIBRARIES := liblog |
17 | LOCAL_C_INCLUDES := $(LOCAL_PATH)/include | ||
15 | include $(BUILD_EXECUTABLE) | 18 | include $(BUILD_EXECUTABLE) |
diff --git a/include/sync/sync.h b/libsync/include/sync/sync.h index 2e5d82f15..2e5d82f15 100644 --- a/include/sync/sync.h +++ b/libsync/include/sync/sync.h | |||
diff --git a/include/sync/sw_sync.h b/libsync/sw_sync.h index 3bf4110e2..fda1c4c57 100644 --- a/include/sync/sw_sync.h +++ b/libsync/sw_sync.h | |||
@@ -19,8 +19,6 @@ | |||
19 | #ifndef __SYS_CORE_SW_SYNC_H | 19 | #ifndef __SYS_CORE_SW_SYNC_H |
20 | #define __SYS_CORE_SW_SYNC_H | 20 | #define __SYS_CORE_SW_SYNC_H |
21 | 21 | ||
22 | #include "sync.h" | ||
23 | |||
24 | __BEGIN_DECLS | 22 | __BEGIN_DECLS |
25 | 23 | ||
26 | /* | 24 | /* |
diff --git a/libsync/sync_test.c b/libsync/sync_test.c index 386747a62..ee9ea3ca1 100644 --- a/libsync/sync_test.c +++ b/libsync/sync_test.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <unistd.h> | 23 | #include <unistd.h> |
24 | 24 | ||
25 | #include <sync/sync.h> | 25 | #include <sync/sync.h> |
26 | #include "sw_sync.h" | ||
26 | 27 | ||
27 | pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; | 28 | pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; |
28 | 29 | ||