Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5234147c authored by Rom Lemarchand's avatar Rom Lemarchand Committed by Gerrit Code Review
Browse files

Merge "move sync headers from include to libsync"

parents f5447b0e ddc20de1

include/system/window.h

+0 −1
Original line number Diff line number Diff line
@@ -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>

libsync/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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)

include/sync/sync.h→libsync/include/sync/sync.h

+0 −0

File moved.

View file

include/sync/sw_sync.h→libsync/sw_sync.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#ifndef __SYS_CORE_SW_SYNC_H

#define __SYS_CORE_SW_SYNC_H



#include "sync.h"



__BEGIN_DECLS



/*

libsync/sync_test.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <unistd.h>



#include <sync/sync.h>

#include "sw_sync.h"



pthread_mutex_t printf_mutex = PTHREAD_MUTEX_INITIALIZER;