diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-02-28 03:49:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-28 03:49:03 +0000 |
| commit | b84b1409efc0e2df28ff0969e10d33e40fc458f2 (patch) | |
| tree | 1446075a9f0bab33cb2592e7a5801aaad0d9bf31 /Android.mk | |
| parent | 7fb4687279b703d9f866cefac5fc6967fb81068a (diff) | |
| parent | 14d8fa0373cc75eea1bd8413b7757b918a4ff3c7 (diff) | |
| download | jpeg-b84b1409efc0e2df28ff0969e10d33e40fc458f2.tar.gz | |
am 14d8fa03: Merge "[MIPS] Inverse DCT optimizations"android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-dev
* commit '14d8fa0373cc75eea1bd8413b7757b918a4ff3c7':
[MIPS] Inverse DCT optimizations
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 38 |
1 files changed, 34 insertions, 4 deletions
@@ -36,11 +36,23 @@ LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays LOCAL_CFLAGS += -DANDROID_TILE_BASED_DECODE ifeq ($(TARGET_ARCH_VARIANT),x86-atom) -LOCAL_CFLAGS += -DANDROID_INTELSSE2_IDCT -LOCAL_SRC_FILES += jidctintelsse.c -else + LOCAL_CFLAGS += -DANDROID_INTELSSE2_IDCT + LOCAL_SRC_FILES += jidctintelsse.c +endif + # enable armv6 idct assembly -LOCAL_CFLAGS += -DANDROID_ARMV6_IDCT +ifeq ($(strip $(TARGET_ARCH)),arm) + LOCAL_CFLAGS += -DANDROID_ARMV6_IDCT +endif + +# use mips assembler IDCT implementation if MIPS DSP-ASE is present +ifeq ($(strip $(TARGET_ARCH)),mips) + ifeq ($(strip $(ARCH_MIPS_HAS_DSP)),true) + LOCAL_CFLAGS += -DANDROID_MIPS_IDCT + LOCAL_SRC_FILES += \ + mips_jidctfst.c \ + mips_idct_le.S + endif endif LOCAL_MODULE := libjpeg_static @@ -67,3 +79,21 @@ LOCAL_SDK_VERSION := 17 endif include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_ARM_MODE := arm +LOCAL_SRC_FILES := \ + cjpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h rdswitch.c cdjpeg.c rdtarga.c rdppm.c rdgif.c rdbmp.c +LOCAL_MODULE:= cjpeg +LOCAL_MODULE_TAGS := eng +LOCAL_SHARED_LIBRARIES := libc libcutils libjpeg +include $(BUILD_EXECUTABLE) + +include $(CLEAR_VARS) +LOCAL_ARM_MODE := arm +LOCAL_SRC_FILES := \ + djpeg.c cdjpeg.h jinclude.h jconfig.h jpeglib.h jmorecfg.h jerror.h cderror.h jversion.h cdjpeg.c wrppm.c wrgif.c wrbmp.c rdcolmap.c wrtarga.c +LOCAL_MODULE:= djpeg +LOCAL_MODULE_TAGS := eng +LOCAL_SHARED_LIBRARIES := libc libcutils libjpeg +include $(BUILD_EXECUTABLE) |