diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-08-11 00:50:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 00:50:56 -0700 |
| commit | 7b6d0d99b6904b511996267efae215fe9cb5e98f (patch) | |
| tree | 85c1f63b5ba66ec77d5c9ecd5a2b44229ed67699 /core/jni/Android.mk | |
| parent | ea65ec23f6dc18e978ab6dcf23d3c2b27a0c2109 (diff) | |
| parent | 679ac09a5c22175354f3a04b28456b323839530e (diff) | |
| download | frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.zip frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.tar.gz frameworks_base-7b6d0d99b6904b511996267efae215fe9cb5e98f.tar.bz2 | |
am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread
Merge commit '679ac09a5c22175354f3a04b28456b323839530e'
* commit '679ac09a5c22175354f3a04b28456b323839530e':
More native work.
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 d1a5ae1..860b5b7 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -139,7 +139,8 @@ LOCAL_SRC_FILES:= \ android_backup_BackupDataOutput.cpp \ android_backup_FileBackupHelperBase.cpp \ android_backup_BackupHelperDispatcher.cpp \ - android_content_res_ObbScanner.cpp + android_content_res_ObbScanner.cpp \ + android_content_res_Configuration.cpp LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ |