OSDN Git Service

Remove unnecessary SkImageDecoder_libjpeg.cpp
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 10 Mar 2011 09:49:03 +0000 (17:49 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 19 Jul 2011 07:03:54 +0000 (15:03 +0800)
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

index 7802efd..81c6167 100644 (file)
@@ -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 \