diff options
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/Time.cpp (renamed from libs/ui/Time.cpp) | 2 | ||||
| -rw-r--r-- | core/jni/TimeUtils.h (renamed from include/utils/TimeUtils.h) | 0 | ||||
| -rw-r--r-- | core/jni/android_text_format_Time.cpp | 2 | ||||
| -rw-r--r-- | libs/ui/Android.mk | 3 |
5 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 80c2489..b328869 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 index b553913..f3037f3 100644 --- a/libs/ui/Time.cpp +++ b/core/jni/Time.cpp @@ -1,4 +1,4 @@ -#include <utils/TimeUtils.h> +#include "TimeUtils.h" #include <stdio.h> #include <cutils/tztime.h> diff --git a/include/utils/TimeUtils.h b/core/jni/TimeUtils.h index b19e021..b19e021 100644 --- a/include/utils/TimeUtils.h +++ b/core/jni/TimeUtils.h diff --git a/core/jni/android_text_format_Time.cpp b/core/jni/android_text_format_Time.cpp index 7c208e9..98f4e03 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 <utils/TimeUtils.h> +#include "TimeUtils.h" #include <nativehelper/JNIHelp.h> #include <cutils/tztime.h> diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk index b3b2104..7bbe38b 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 \ |