summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@android.com>2011-03-11 14:22:22 -0800
committerAndroid Code Review <code-review@android.com>2011-03-11 14:22:22 -0800
commit2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d (patch)
treedd4fb9617e0f3546ce5a771bf5a655f12a812008
parent1de4a2ca58df9bd21e054742f52e0af7a2ed5864 (diff)
parentc2d68c90961328721a6b90577f684f6deb16165d (diff)
downloadframeworks_base-2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d.zip
frameworks_base-2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d.tar.gz
frameworks_base-2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d.tar.bz2
Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"
-rw-r--r--media/tests/omxjpegdecoder/Android.mk5
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 \