Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 5350 into donut

Browse Source 
* changes:
  move ui/Time.cpp to core/jni, since this is the only place it is used
This commit is contained in:
Android (Google) Code Review
2009-06-25 15:09:44 -07:00
parent 2450173b78 864c0d50cd
commit c44989d6c7
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/Android.mk
View File

@@ -19,6 +19,7 @@ LOCAL_SRC_FILES:= \
ActivityManager.cpp \ ActivityManager.cpp \
AndroidRuntime.cpp \ AndroidRuntime.cpp \
CursorWindow.cpp \ CursorWindow.cpp \
Time.cpp \
com_google_android_gles_jni_EGLImpl.cpp \ com_google_android_gles_jni_EGLImpl.cpp \
com_google_android_gles_jni_GLImpl.cpp.arm \ com_google_android_gles_jni_GLImpl.cpp.arm \
android_opengl_GLES10.cpp \ android_opengl_GLES10.cpp \

2
libs/ui/Time.cpp → core/jni/Time.cpp
View File

@@ -1,4 +1,4 @@
#include <utils/TimeUtils.h> #include "TimeUtils.h"
#include <stdio.h> #include <stdio.h>
#include <cutils/tztime.h> #include <cutils/tztime.h>

0
include/utils/TimeUtils.h → core/jni/TimeUtils.h
View File

2
core/jni/android_text_format_Time.cpp
View File

@@ -23,7 +23,7 @@
#include "jni.h" #include "jni.h"
#include "utils/misc.h" #include "utils/misc.h"
#include "android_runtime/AndroidRuntime.h" #include "android_runtime/AndroidRuntime.h"
#include <utils/TimeUtils.h> #include "TimeUtils.h"
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <cutils/tztime.h> #include <cutils/tztime.h>

3
libs/ui/Android.mk
View File

@@ -24,8 +24,7 @@ LOCAL_SRC_FILES:= \
Region.cpp \ Region.cpp \
Surface.cpp \ Surface.cpp \
SurfaceComposerClient.cpp \ SurfaceComposerClient.cpp \
SurfaceFlingerSynchro.cpp \ SurfaceFlingerSynchro.cpp
Time.cpp
LOCAL_SHARED_LIBRARIES := \ LOCAL_SHARED_LIBRARIES := \
libcorecg \ libcorecg \