ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am c8d7d2d6: am 5234147c: Merge "move sync headers from include to libsync"

Browse source 
* commit 'c8d7d2d6b99f405ea3fcada0d2407baee23873f6':
  move sync headers from include to libsync
This commit is contained in:
Rom Lemarchand 2014-01-03 21:35:54 +00:00 • committed by Android Git Automerger
commit 1892fe66ea
5 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/system/window.h
View file

@ -22,7 +22,6 @@
#include <limits.h> #include <limits.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <sync/sync.h>
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <system/graphics.h> #include <system/graphics.h>
#include <unistd.h> #include <unistd.h>

3
libsync/Android.mk
View file

@ -5,6 +5,8 @@ LOCAL_SRC_FILES := sync.c
LOCAL_MODULE := libsync LOCAL_MODULE := libsync
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -12,4 +14,5 @@ LOCAL_SRC_FILES := sync.c sync_test.c
LOCAL_MODULE := sync_test LOCAL_MODULE := sync_test
LOCAL_MODULE_TAGS := optional tests LOCAL_MODULE_TAGS := optional tests
LOCAL_SHARED_LIBRARIES := liblog LOCAL_SHARED_LIBRARIES := liblog
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

0
include/sync/sync.h → libsync/include/sync/sync.h
View file

2
include/sync/sw_sync.h → libsync/sw_sync.h
View file

@ -19,8 +19,6 @@
#ifndef __SYS_CORE_SW_SYNC_H #ifndef __SYS_CORE_SW_SYNC_H
#define __SYS_CORE_SW_SYNC_H #define __SYS_CORE_SW_SYNC_H
#include "sync.h"
__BEGIN_DECLS __BEGIN_DECLS
/* /*

1
libsync/sync_test.c
View file

@ -23,6 +23,7 @@
#include <unistd.h> #include <unistd.h>
#include <sync/sync.h> #include <sync/sync.h>
#include "sw_sync.h"
pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER;