summaryrefslogtreecommitdiffstats
path: root/media/mtp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-24 15:42:39 -0700
committerElliott Hughes <enh@google.com>2014-07-24 15:51:46 -0700
commit37b216c75ca5e38f1a56a86a95b04ff6b4e71ae7 (patch)
tree9fe38c8ba296b41db0ad080608f60bde289cb740 /media/mtp
parent81e50d0c782cc18eab4ef40ecd6c7f36df50fea5 (diff)
downloadframeworks_av-37b216c75ca5e38f1a56a86a95b04ff6b4e71ae7.zip
frameworks_av-37b216c75ca5e38f1a56a86a95b04ff6b4e71ae7.tar.gz
frameworks_av-37b216c75ca5e38f1a56a86a95b04ff6b4e71ae7.tar.bz2
Remove last user of <cutils/tztime.h>.
Bug: 15765976 (cherry picked from commit 56687f7cbf0a3d7909830fc1390a98c713a05e6f) Change-Id: Iacb225584c3acdbb512f46b638a215b75b32cdcb
Diffstat (limited to 'media/mtp')
-rw-r--r--media/mtp/Android.mk3
-rw-r--r--media/mtp/MtpUtils.cpp3
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 {