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/AndroidRuntime.cpp | |
| 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/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 422020e..d1e87f3 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -154,6 +154,7 @@ extern int register_android_ddm_DdmHandleNativeHeap(JNIEnv *env); extern int register_com_android_internal_os_ZygoteInit(JNIEnv* env); extern int register_android_util_Base64(JNIEnv* env); extern int register_android_location_GpsLocationProvider(JNIEnv* env); +extern int register_android_backup_FileBackupHelper(JNIEnv *env); static AndroidRuntime* gCurRuntime = NULL; @@ -1168,6 +1169,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_ddm_DdmHandleNativeHeap), REG_JNI(register_android_util_Base64), REG_JNI(register_android_location_GpsLocationProvider), + REG_JNI(register_android_backup_FileBackupHelper), }; /* |