diff options
| author | Rom Lemarchand <romlem@google.com> | 2014-01-03 21:27:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-03 21:27:46 +0000 |
| commit | 5234147c1e5cade7ecf98c12c8a7d7de6cd429ed (patch) | |
| tree | afe715bfbf684fcb3fe9c38b490eb80c857329f6 | |
| parent | f5447b0eb9cd2157f4935477f05d4c92dcda37c8 (diff) | |
| parent | ddc20de1483028ee0b4401266499a59631e9d659 (diff) | |
| download | system_core-5234147c1e5cade7ecf98c12c8a7d7de6cd429ed.zip system_core-5234147c1e5cade7ecf98c12c8a7d7de6cd429ed.tar.gz system_core-5234147c1e5cade7ecf98c12c8a7d7de6cd429ed.tar.bz2 | |
Merge "move sync headers from include to libsync"
| -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 649bd71..588f9c6 100644 --- a/include/system/window.h +++ b/include/system/window.h @@ -22,7 +22,6 @@ #include <limits.h> #include <stdint.h> #include <string.h> -#include <sync/sync.h> #include <sys/cdefs.h> #include <system/graphics.h> #include <unistd.h> diff --git a/libsync/Android.mk b/libsync/Android.mk index 73de069..626b762 100644 --- a/libsync/Android.mk +++ b/libsync/Android.mk @@ -5,6 +5,8 @@ LOCAL_SRC_FILES := sync.c LOCAL_MODULE := libsync LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := liblog +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -12,4 +14,5 @@ LOCAL_SRC_FILES := sync.c sync_test.c LOCAL_MODULE := sync_test LOCAL_MODULE_TAGS := optional tests LOCAL_SHARED_LIBRARIES := liblog +LOCAL_C_INCLUDES := $(LOCAL_PATH)/include include $(BUILD_EXECUTABLE) diff --git a/include/sync/sync.h b/libsync/include/sync/sync.h index 2e5d82f..2e5d82f 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 3bf4110..fda1c4c 100644 --- a/include/sync/sw_sync.h +++ b/libsync/sw_sync.h @@ -19,8 +19,6 @@ #ifndef __SYS_CORE_SW_SYNC_H #define __SYS_CORE_SW_SYNC_H -#include "sync.h" - __BEGIN_DECLS /* diff --git a/libsync/sync_test.c b/libsync/sync_test.c index 386747a..ee9ea3c 100644 --- a/libsync/sync_test.c +++ b/libsync/sync_test.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <sync/sync.h> +#include "sw_sync.h" pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; |