diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 13:20:31 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-22 13:20:31 -0700 |
| commit | 4527acb0c39258792ae55604cb4d71006bf8d938 (patch) | |
| tree | f1e2b09db0abc31c15d56ec7e718a09aabd00861 /core/jni/Android.mk | |
| parent | ffe4ddfe95e8b31e0cb579ab537a1373f6208bcc (diff) | |
| parent | 856dd8a60a70a5b7dca2bf2114872ce063e2ad60 (diff) | |
| download | frameworks_base-4527acb0c39258792ae55604cb4d71006bf8d938.zip frameworks_base-4527acb0c39258792ae55604cb4d71006bf8d938.tar.gz frameworks_base-4527acb0c39258792ae55604cb4d71006bf8d938.tar.bz2 | |
am 856dd8a6: Merge change 4952 into donut
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'
* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
Helper API cleanup. Allows multiple helpers to function,
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index f194a23..0ecf678 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -121,8 +121,7 @@ LOCAL_SRC_FILES:= \ com_android_internal_graphics_NativeUtils.cpp \ android_backup_BackupDataInput.cpp \ android_backup_BackupDataOutput.cpp \ - android_backup_FileBackupHelper.cpp \ - android_backup_RestoreHelperBase.cpp + android_backup_FileBackupHelperBase.cpp LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ |