diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 22:20:28 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-18 22:20:28 -0700 |
| commit | b1487e4c587ce1184e3d0036ac5e6bd90405688d (patch) | |
| tree | 4d4ca149c95f7b056b20b65d66cdc9bdbbcf60fd | |
| parent | f614d64d4b4dfcd20c77ac3ccf2d9c9090a49303 (diff) | |
| download | system_core-b1487e4c587ce1184e3d0036ac5e6bd90405688d.tar.gz system_core-b1487e4c587ce1184e3d0036ac5e6bd90405688d.tar.bz2 system_core-b1487e4c587ce1184e3d0036ac5e6bd90405688d.zip | |
auto import //branches/master/...@140412
| -rw-r--r-- | include/cutils/tztime.h | 7 | ||||
| -rw-r--r-- | libcutils/Android.mk | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/include/cutils/tztime.h b/include/cutils/tztime.h index 9b3ece84..4af2ce49 100644 --- a/include/cutils/tztime.h +++ b/include/cutils/tztime.h @@ -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 diff --git a/libcutils/Android.mk b/libcutils/Android.mk index a43f7e3e..b6d806e4 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -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 + 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) |