OSDN Git Service

am 59ed029b: Merge "Upgrade to tzcode2013d."
authorElliott Hughes <enh@google.com>
Mon, 15 Jul 2013 17:11:04 +0000 (10:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Jul 2013 17:11:04 +0000 (10:11 -0700)
* commit '59ed029b286a1564f635377296e4f088e0fd2afa':
  Upgrade to tzcode2013d.

1  2 
libc/Android.mk

diff --cc libc/Android.mk
@@@ -782,12 -798,14 +798,17 @@@ LOCAL_CFLAGS := $(libc_common_cflags) 
  LOCAL_C_INCLUDES := $(libc_common_c_includes)
  LOCAL_MODULE := libc_common
  LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
- LOCAL_WHOLE_STATIC_LIBRARIES := libbionic_ssp libc_bionic libc_freebsd libc_netbsd
+ LOCAL_WHOLE_STATIC_LIBRARIES := \
+     libbionic_ssp \
+     libc_bionic \
+     libc_freebsd \
+     libc_netbsd \
+     libc_tzcode
  LOCAL_SYSTEM_SHARED_LIBRARIES :=
  
 +# TODO: split out the asflags.
 +LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
 +
  include $(BUILD_STATIC_LIBRARY)