From 864c0d50cda714d73fa70e3600ec36b5db8a835a Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Wed, 24 Jun 2009 23:12:06 -0700 Subject: [PATCH] move ui/Time.cpp to core/jni, since this is the only place it is used --- core/jni/Android.mk | 1 + {libs/ui => core/jni}/Time.cpp | 2 +- {include/utils => core/jni}/TimeUtils.h | 0 core/jni/android_text_format_Time.cpp | 2 +- libs/ui/Android.mk | 3 +-- 5 files changed, 4 insertions(+), 4 deletions(-) rename {libs/ui => core/jni}/Time.cpp (99%) rename {include/utils => core/jni}/TimeUtils.h (100%) diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 80c2489202c11..b328869525534 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -19,6 +19,7 @@ LOCAL_SRC_FILES:= \ ActivityManager.cpp \ AndroidRuntime.cpp \ CursorWindow.cpp \ + Time.cpp \ com_google_android_gles_jni_EGLImpl.cpp \ com_google_android_gles_jni_GLImpl.cpp.arm \ android_opengl_GLES10.cpp \ diff --git a/libs/ui/Time.cpp b/core/jni/Time.cpp similarity index 99% rename from libs/ui/Time.cpp rename to core/jni/Time.cpp index b5539135facde..f3037f3830390 100644 --- a/libs/ui/Time.cpp +++ b/core/jni/Time.cpp @@ -1,4 +1,4 @@ -#include +#include "TimeUtils.h" #include #include diff --git a/include/utils/TimeUtils.h b/core/jni/TimeUtils.h similarity index 100% rename from include/utils/TimeUtils.h rename to core/jni/TimeUtils.h diff --git a/core/jni/android_text_format_Time.cpp b/core/jni/android_text_format_Time.cpp index 7c208e9680771..98f4e035c0c95 100644 --- a/core/jni/android_text_format_Time.cpp +++ b/core/jni/android_text_format_Time.cpp @@ -23,7 +23,7 @@ #include "jni.h" #include "utils/misc.h" #include "android_runtime/AndroidRuntime.h" -#include +#include "TimeUtils.h" #include #include diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index b3b2104b3c4b7..7bbe38bcbc4b7 100644 --- a/libs/ui/Android.mk +++ b/libs/ui/Android.mk @@ -24,8 +24,7 @@ LOCAL_SRC_FILES:= \ Region.cpp \ Surface.cpp \ SurfaceComposerClient.cpp \ - SurfaceFlingerSynchro.cpp \ - Time.cpp + SurfaceFlingerSynchro.cpp LOCAL_SHARED_LIBRARIES := \ libcorecg \