From c2d68c90961328721a6b90577f684f6deb16165d Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 10 Mar 2011 17:49:03 +0800 Subject: 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: I3e7533126ef60fe2fd424fdc777760e73c93489b --- media/tests/omxjpegdecoder/Android.mk | 5 ----- 1 file changed, 5 deletions(-) (limited to 'media') 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 \ -- cgit v1.1