diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 15:11:09 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-25 15:11:09 -0700 |
| commit | 1f7300818fae32dcef5a5387b04c8f304b5e1cd5 (patch) | |
| tree | f06fe20bd46c2c57fa2fa78ef95f2737b4674f6f /core/jni/Android.mk | |
| parent | 98c600eb35dbb4449ebcfd00270092b2d0b34b27 (diff) | |
| parent | c44989d6c7bcc761fb37f54fd37aac2070ba8e5e (diff) | |
| download | frameworks_base-1f7300818fae32dcef5a5387b04c8f304b5e1cd5.zip frameworks_base-1f7300818fae32dcef5a5387b04c8f304b5e1cd5.tar.gz frameworks_base-1f7300818fae32dcef5a5387b04c8f304b5e1cd5.tar.bz2 | |
am c44989d6: Merge change 5350 into donut
Merge commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e'
* commit 'c44989d6c7bcc761fb37f54fd37aac2070ba8e5e':
move ui/Time.cpp to core/jni, since this is the only place it is used
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 0ecf678..c501b20 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -23,6 +23,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 \ |