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

Commit b1487e4c authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

auto import //branches/master/...@140412

parent f614d64d

include/cutils/tztime.h

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef _CUTILS_TZTIME_H

#define _CUTILS_TZTIME_H



#include <time.h>



#ifdef __cplusplus

extern "C" {

#endif
@@ -24,6 +26,9 @@ extern "C" { 
time_t mktime_tz(struct tm * const tmp, char const * tz);

void localtime_tz(const time_t * const timep, struct tm * tmp, const char* tz);



#ifndef HAVE_ANDROID_OS

/* the following is defined in <time.h> in Bionic */



struct strftime_locale {

    const char *mon[12];    /* short names */

    const char *month[12];  /* long names */
@@ -39,6 +44,8 @@ struct strftime_locale { 


size_t strftime_tz(char *s, size_t max, const char *format, const struct tm *tm, const struct strftime_locale *locale);



#endif /* !HAVE_ANDROID_OS */



#ifdef __cplusplus

}

#endif

libcutils/Android.mk

+9 −4
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ commonSources := \ 
	properties.c \

	threads.c



commonHostSources := \

        ashmem-host.c



# some files must not be compiled when building against Mingw

# they correspond to features not used by our host development tools

# which are also hard or even impossible to port to native Win32
@@ -60,16 +63,18 @@ else 
        selector.c \

        fdevent.c \

        tztime.c \

        tzstrftime.c \

        adb_networking.c \

        zygote.c



    commonHostSources += \

        tzstrftime.c

endif





# Static library for host

# ========================================================

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) ashmem-host.c

LOCAL_SRC_FILES := $(commonSources) $(commonHostSources)

LOCAL_LDLIBS := -lpthread

LOCAL_STATIC_LIBRARIES := liblog

include $(BUILD_HOST_STATIC_LIBRARY)
@@ -81,7 +86,7 @@ ifeq ($(TARGET_SIMULATOR),true) 
# ========================================================

include $(CLEAR_VARS)

LOCAL_MODULE := libcutils

LOCAL_SRC_FILES := $(commonSources) memory.c dlmalloc_stubs.c ashmem-host.c

LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) memory.c dlmalloc_stubs.c

LOCAL_LDLIBS := -lpthread

LOCAL_SHARED_LIBRARIES := liblog

include $(BUILD_SHARED_LIBRARY)