diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-24 22:49:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-23 17:53:27 +0000 |
| commit | cae00fcc369ff5d08e8ebccf3d2872048579ea83 (patch) | |
| tree | f5659c9611340e7eea929a1c3d01492477334b72 /media | |
| parent | 3879792f62e0d3eac295c703c1968a82022fddb1 (diff) | |
| parent | 56687f7cbf0a3d7909830fc1390a98c713a05e6f (diff) | |
| download | frameworks_av-cae00fcc369ff5d08e8ebccf3d2872048579ea83.zip frameworks_av-cae00fcc369ff5d08e8ebccf3d2872048579ea83.tar.gz frameworks_av-cae00fcc369ff5d08e8ebccf3d2872048579ea83.tar.bz2 | |
Merge "Remove last user of <cutils/tztime.h>."
Diffstat (limited to 'media')
| -rw-r--r-- | media/mtp/Android.mk | 3 | ||||
| -rw-r--r-- | media/mtp/MtpUtils.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk index ac608a1..3af0956 100644 --- a/media/mtp/Android.mk +++ b/media/mtp/Android.mk @@ -39,9 +39,6 @@ LOCAL_MODULE:= libmtp LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST -# Needed for <bionic_time.h> -LOCAL_C_INCLUDES := bionic/libc/private - LOCAL_SHARED_LIBRARIES := libutils libcutils liblog libusbhost libbinder include $(BUILD_SHARED_LIBRARY) diff --git a/media/mtp/MtpUtils.cpp b/media/mtp/MtpUtils.cpp index 6ec8876..0667bdd 100644 --- a/media/mtp/MtpUtils.cpp +++ b/media/mtp/MtpUtils.cpp @@ -19,7 +19,8 @@ #include <stdio.h> #include <time.h> -#include <cutils/tztime.h> +#include <../private/bionic_time.h> /* TODO: switch this code to icu4c! */ + #include "MtpUtils.h" namespace android { |