diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-06-21 22:04:28 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-21 22:04:28 +0000 |
commit | 55acd713d02f61c984e10ff2d4cef775a7fb597c (patch) | |
tree | 2afba6469ae443b3da79828f87b2f128a0e4edd9 | |
parent | b7c209490772cb1a4c76b7f086af314e04d6bc25 (diff) | |
parent | f145037bc84ef5d4400e047fc2a0e697a481e22c (diff) | |
download | jpeg-55acd713d02f61c984e10ff2d4cef775a7fb597c.tar.gz |
Merge "Add NDK versions of libjpeg"android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2
-rw-r--r-- | Android.mk | 72 |
1 files changed, 63 insertions, 9 deletions
@@ -1,6 +1,6 @@ LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_ARM_MODE := arm LOCAL_SRC_FILES := \ @@ -23,7 +23,6 @@ endif LOCAL_CFLAGS += -DAVOID_TABLES LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays LOCAL_CFLAGS += -Wno-unused-parameter -#LOCAL_CFLAGS += -march=armv6j # enable tile based decode LOCAL_CFLAGS += -DANDROID_TILE_BASED_DECODE @@ -61,14 +60,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) include $(BUILD_STATIC_LIBRARY) - # Build shared library include $(CLEAR_VARS) LOCAL_MODULE := libjpeg - -LOCAL_MODULE_TAGS := optional - LOCAL_WHOLE_STATIC_LIBRARIES = libjpeg_static ifeq (,$(TARGET_BUILD_APPS)) @@ -79,9 +74,68 @@ else LOCAL_SDK_VERSION := 17 endif +include $(BUILD_SHARED_LIBRARY) + + +# Build static library against NDK +include $(CLEAR_VARS) + +LOCAL_ARM_MODE := arm + +LOCAL_SRC_FILES := \ + jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c \ + jcinit.c jcmainct.c jcmarker.c jcmaster.c jcomapi.c jcparam.c \ + jcphuff.c jcprepct.c jcsample.c jctrans.c jdapimin.c jdapistd.c \ + jdatadst.c jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c \ + jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c \ + jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c \ + jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ + jquant2.c jutils.c jmemmgr.c jmemnobs.c + +LOCAL_SRC_FILES_arm += armv6_idct.S + +LOCAL_SDK_VERSION := 17 +LOCAL_NDK_STL_VARIANT := none + +LOCAL_CFLAGS += -DAVOID_TABLES +LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays +LOCAL_CFLAGS += -Wno-unused-parameter + +# enable tile based decode +LOCAL_CFLAGS += -DANDROID_TILE_BASED_DECODE + +LOCAL_CFLAGS_x86 += -DANDROID_INTELSSE2_IDCT +LOCAL_SRC_FILES_x86 += jidctintelsse.c + +LOCAL_SRC_FILES_arm64 += \ + jsimd_arm64_neon.S \ + jsimd_neon.c + +ifeq ($(ARCH_ARM_HAVE_NEON),true) + #use NEON accelerations + LOCAL_CFLAGS_arm += -DNV_ARM_NEON -D__ARM_HAVE_NEON + LOCAL_SRC_FILES_arm += \ + jsimd_arm_neon.S \ + jsimd_neon.c +else + # enable armv6 idct assembly + LOCAL_CFLAGS_arm += -DANDROID_ARMV6_IDCT +endif + +# use mips assembler IDCT implementation if MIPS DSP-ASE is present +ifeq ($(strip $(ARCH_MIPS_HAS_DSP)),true) +LOCAL_CFLAGS_mips += -DANDROID_MIPS_IDCT +LOCAL_SRC_FILES_mips += \ + mips_jidctfst.c \ + mips_idct_le.S +endif + +LOCAL_MODULE := libjpeg_static_ndk + LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -include $(BUILD_SHARED_LIBRARY) +include $(BUILD_STATIC_LIBRARY) + include $(CLEAR_VARS) LOCAL_ARM_MODE := arm @@ -89,7 +143,7 @@ LOCAL_SRC_FILES := \ cjpeg.c 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 +LOCAL_SHARED_LIBRARIES := libcutils libjpeg include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) @@ -98,5 +152,5 @@ LOCAL_SRC_FILES := \ djpeg.c 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 +LOCAL_SHARED_LIBRARIES := libcutils libjpeg include $(BUILD_EXECUTABLE) |