diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-08 13:13:12 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-08 13:13:12 -0700 |
| commit | 6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541 (patch) | |
| tree | c844365aa767f37da6081150dcf3caccb4fb6d46 /core/jni/Android.mk | |
| parent | 6bebbcd57b7b3ffad3af046f4899d885b30c828e (diff) | |
| parent | 3cf650dec40c0e40d613c76bd70453205af76ed8 (diff) | |
| download | frameworks_base-6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541.zip frameworks_base-6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541.tar.gz frameworks_base-6ec72e3fa9cdf9e896f3042fb1b1b4f3f6cea541.tar.bz2 | |
Merge commit 'goog/master' into merge_master
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 48675a1..702ea87 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -117,7 +117,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) \ |