diff options
author | Mathias Agopian <mathias@google.com> | 2009-06-24 18:31:21 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-06-24 18:31:21 -0700 |
commit | f31868e59fbf59a8d479587c80b648fb37a166fc (patch) | |
tree | 5a0aa67a76d6b0e48041f557eefd764e57eb97cf /core/jni/Android.mk | |
parent | c6603951d45fc9b0d1776fec9444b6f31af92840 (diff) | |
parent | ecf2b68d834d334de218dc427615b4ca05c0293a (diff) | |
download | frameworks_base-f31868e59fbf59a8d479587c80b648fb37a166fc.zip frameworks_base-f31868e59fbf59a8d479587c80b648fb37a166fc.tar.gz frameworks_base-f31868e59fbf59a8d479587c80b648fb37a166fc.tar.bz2 |
merge master in master_gl
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 251bc84..b5d3b26 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -123,8 +123,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) \ |