diff options
| author | Wei-Ta Chen <weita@google.com> | 2010-09-22 23:06:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 23:06:55 -0700 |
| commit | a23cdda0a5fad7798454ecb05a7855cb9211ea22 (patch) | |
| tree | 61ec41b020a3187c3574b494be2bfa080d37a06b /core/jni/Android.mk | |
| parent | 8e2b203c389fe5c601bb19335267358f8ce8decb (diff) | |
| parent | ac487f708f7b58dbd4f3021b520c6ed5975daebe (diff) | |
| download | frameworks_base-a23cdda0a5fad7798454ecb05a7855cb9211ea22.zip frameworks_base-a23cdda0a5fad7798454ecb05a7855cb9211ea22.tar.gz frameworks_base-a23cdda0a5fad7798454ecb05a7855cb9211ea22.tar.bz2 | |
am ac487f70: am 6b849e21: Unhide BitmapRegionDecoder.
Merge commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe'
* commit 'ac487f708f7b58dbd4f3021b520c6ed5975daebe':
Unhide BitmapRegionDecoder.
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 8310e56..fffd185 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -105,12 +105,13 @@ LOCAL_SRC_FILES:= \ android_graphics_PixelFormat.cpp \ android/graphics/Picture.cpp \ android/graphics/PorterDuff.cpp \ - android/graphics/LargeBitmap.cpp \ + android/graphics/BitmapRegionDecoder.cpp \ android/graphics/Rasterizer.cpp \ android/graphics/Region.cpp \ android/graphics/Shader.cpp \ android/graphics/TextLayout.cpp \ android/graphics/Typeface.cpp \ + android/graphics/Utils.cpp \ android/graphics/Xfermode.cpp \ android/graphics/YuvToJpegEncoder.cpp \ android_media_AudioRecord.cpp \ |