diff options
| author | Kenny Root <kroot@android.com> | 2011-03-11 15:45:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-11 15:45:34 -0800 |
| commit | 206c62ed34dc8a48fd6c907d95456226949f42dd (patch) | |
| tree | af68ef87f4ec9619b110e20c58e24863fbd3bebd /media | |
| parent | 7d93b7574f741a9cd8872771faefa3c92bed6576 (diff) | |
| parent | 2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d (diff) | |
| download | frameworks_base-206c62ed34dc8a48fd6c907d95456226949f42dd.zip frameworks_base-206c62ed34dc8a48fd6c907d95456226949f42dd.tar.gz frameworks_base-206c62ed34dc8a48fd6c907d95456226949f42dd.tar.bz2 | |
am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
* commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d':
Remove unnecessary SkImageDecoder_libjpeg.cpp
Diffstat (limited to 'media')
| -rw-r--r-- | media/tests/omxjpegdecoder/Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/media/tests/omxjpegdecoder/Android.mk b/media/tests/omxjpegdecoder/Android.mk index 7802efd..81c6167 100644 --- a/media/tests/omxjpegdecoder/Android.mk +++ b/media/tests/omxjpegdecoder/Android.mk @@ -22,11 +22,6 @@ LOCAL_SRC_FILES := \ SkOmxPixelRef.cpp \ StreamSource.cpp - -# add external/skia/src/images/SkImageDecoder_libjpeg.cpp -LOCAL_SRC_FILES += \ - ../../../../../external/skia/src/images/SkImageDecoder_libjpeg.cpp - LOCAL_SHARED_LIBRARIES := \ libcutils \ libskia \ |