From 37b216c75ca5e38f1a56a86a95b04ff6b4e71ae7 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 24 Jul 2014 15:42:39 -0700
Subject: Remove last user of <cutils/tztime.h>.

Bug: 15765976

(cherry picked from commit 56687f7cbf0a3d7909830fc1390a98c713a05e6f)

Change-Id: Iacb225584c3acdbb512f46b638a215b75b32cdcb
---
 media/mtp/Android.mk   | 3 ---
 media/mtp/MtpUtils.cpp | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'media/mtp')

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 {
-- 
cgit v1.1