diff options
| author | Joseph Wen <josephwen@google.com> | 2010-08-17 00:35:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-17 00:35:06 -0700 |
| commit | 1b10d3d23512f9f9a091e1f4c27bb3dc47806f6c (patch) | |
| tree | 2e6419775f3744b86ba0c4c762694376629b3bbe /core/jni/Android.mk | |
| parent | 931831dcb8880e6b591e616467f64a6cc999d3ab (diff) | |
| parent | 81dcea6093dfcdadd52982505249a5eacf47a81b (diff) | |
| download | frameworks_base-1b10d3d23512f9f9a091e1f4c27bb3dc47806f6c.zip frameworks_base-1b10d3d23512f9f9a091e1f4c27bb3dc47806f6c.tar.gz frameworks_base-1b10d3d23512f9f9a091e1f4c27bb3dc47806f6c.tar.bz2 | |
am 81dcea60: am f1f48bc7: Do JPEG tile-based decoding.
Merge commit '81dcea6093dfcdadd52982505249a5eacf47a81b'
* commit '81dcea6093dfcdadd52982505249a5eacf47a81b':
Do JPEG tile-based decoding.
Diffstat (limited to 'core/jni/Android.mk')
| -rw-r--r-- | core/jni/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 860b5b7..cb0bdd3 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -82,6 +82,7 @@ LOCAL_SRC_FILES:= \ android_util_Process.cpp \ android_util_StringBlock.cpp \ android_util_XmlBlock.cpp \ + android/graphics/AutoDecodeCancel.cpp \ android/graphics/Bitmap.cpp \ android/graphics/BitmapFactory.cpp \ android/graphics/Camera.cpp \ @@ -105,6 +106,7 @@ LOCAL_SRC_FILES:= \ android_graphics_PixelFormat.cpp \ android/graphics/Picture.cpp \ android/graphics/PorterDuff.cpp \ + android/graphics/LargeBitmap.cpp \ android/graphics/Rasterizer.cpp \ android/graphics/Region.cpp \ android/graphics/Shader.cpp \ |