diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-05-08 07:21:43 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-08 07:21:43 -0700 |
| commit | 1a36071092c209ac763fdb48dcfe87043a2b2cf6 (patch) | |
| tree | 9d053660a58b8f8119d6b0378a22728e1a3869f0 /core/jni/Android.mk | |
| parent | aec09d7ea9eaa842b606d26f8eda3cbd8537e0b3 (diff) | |
| parent | 7ec32cc7c33240c50cca31d2fa1b17f6dc2ccead (diff) | |
| download | frameworks_base-1a36071092c209ac763fdb48dcfe87043a2b2cf6.zip frameworks_base-1a36071092c209ac763fdb48dcfe87043a2b2cf6.tar.gz frameworks_base-1a36071092c209ac763fdb48dcfe87043a2b2cf6.tar.bz2 | |
manual merge of 7ec32cc
Merge commit '7ec32cc'
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index de64e84..5ef678e 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -115,7 +115,8 @@ LOCAL_SRC_FILES:= \ android_ddm_DdmHandleNativeHeap.cpp \ android_location_GpsLocationProvider.cpp \ com_android_internal_os_ZygoteInit.cpp \ - com_android_internal_graphics_NativeUtils.cpp + com_android_internal_graphics_NativeUtils.cpp \ + android_backup_FileBackupHelper.cpp LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ |