diff options
| author | Chih-Wei Huang <cwhuang@linux.org.tw> | 2011-03-10 17:49:03 +0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-11 14:02:39 -0800 |
| commit | 4c1ac4e66560f53625de28663c67e81a5f8f4401 (patch) | |
| tree | 42f7cfec291fdd60fa6a926d40ccf163b16072c0 /media/tests/omxjpegdecoder | |
| parent | f25a7964a3c626013a832516617d0afcb81b2673 (diff) | |
| download | frameworks_base-4c1ac4e66560f53625de28663c67e81a5f8f4401.zip frameworks_base-4c1ac4e66560f53625de28663c67e81a5f8f4401.tar.gz frameworks_base-4c1ac4e66560f53625de28663c67e81a5f8f4401.tar.bz2 | |
Remove unnecessary SkImageDecoder_libjpeg.cpp
Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files
to an unexpected directory. In this case, it's
out/target/external/skia/src/images/SkImageDecoder_libjpeg.o
It's not in $(PRODUCT_OUT), which is not correct.
Worse, it makes the build system be unable to build different
architectures (arm and x86) simultaneously, since the output files
conflcit.
Seems we can just remove SkImageDecoder_libjpeg.cpp since it's
already in libskia.
Change-Id: Ia0ed72d8a6cbd3b2f3997b71dfdcf72fee50f5bb
Diffstat (limited to 'media/tests/omxjpegdecoder')
| -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 \ |