diff options
| author | Mathias Agopian <mathias@google.com> | 2009-07-01 18:33:18 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-07-01 18:33:18 -0700 |
| commit | dfe983bd7979ccb1602f29b8f9804c98411d9cd6 (patch) | |
| tree | 8a5547078b72cb262e54f0640dd4ed746b5805ef /core/jni/Android.mk | |
| parent | 3a6b160a3b52cd96fb383d5ee93c22e5e938e0e2 (diff) | |
| parent | 7f32b426cd6a865ac5e6e3e9fa833e9327fb415a (diff) | |
| download | frameworks_base-dfe983bd7979ccb1602f29b8f9804c98411d9cd6.zip frameworks_base-dfe983bd7979ccb1602f29b8f9804c98411d9cd6.tar.gz frameworks_base-dfe983bd7979ccb1602f29b8f9804c98411d9cd6.tar.bz2 | |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index b5d3b26..e99971a 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -25,6 +25,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 \ @@ -123,7 +124,8 @@ LOCAL_SRC_FILES:= \ com_android_internal_graphics_NativeUtils.cpp \ android_backup_BackupDataInput.cpp \ android_backup_BackupDataOutput.cpp \ - android_backup_FileBackupHelperBase.cpp + android_backup_FileBackupHelperBase.cpp \ + android_backup_BackupHelperDispatcher.cpp LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ |