From 930bf01caf3cbcabf97444b3071bcaff28597635 Mon Sep 17 00:00:00 2001
From: Dees_Troy <dees_troy@teamw.in>
Date: Sat, 10 Aug 2013 22:19:03 +0000
Subject: Remove libjpegtwrp and use CM provided libjpeg

---
 libjpegtwrp/Android.mk | 77 --------------------------------------------------
 1 file changed, 77 deletions(-)
 delete mode 100755 libjpegtwrp/Android.mk

(limited to 'libjpegtwrp/Android.mk')

diff --git a/libjpegtwrp/Android.mk b/libjpegtwrp/Android.mk
deleted file mode 100755
index 98b253958..000000000
--- a/libjpegtwrp/Android.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_ARM_MODE := arm
-
-# Set ANDROID_JPEG_USE_VENUM to true to enable VeNum optimizations
-ANDROID_JPEG_USE_VENUM := true
-
-# Disable VeNum optimizations if they are not supported on the build target
-ifneq ($(ARCH_ARM_HAVE_VFP),true)
-ANDROID_JPEG_USE_VENUM := false
-else
-ifneq ($(ARCH_ARM_HAVE_NEON),true)
-ANDROID_JPEG_USE_VENUM := false
-endif
-endif
-
-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 jquant1.c \
-	jquant2.c jutils.c jmemmgr.c \
-
-# use ashmem as libjpeg decoder's backing store
-LOCAL_CFLAGS += -DUSE_ANDROID_ASHMEM
-LOCAL_SRC_FILES += \
-	jmem-ashmem.c
-
-# the original android memory manager.
-# use sdcard as libjpeg decoder's backing store
-#LOCAL_SRC_FILES += \
-#	jmem-android.c
-
-
-# the assembler is only for the ARM version, don't break the Linux sim
-ifneq ($(TARGET_ARCH),arm)
-ANDROID_JPEG_NO_ASSEMBLER := true
-endif
-
-ifeq ($(strip $(ANDROID_JPEG_NO_ASSEMBLER)),true)
-LOCAL_SRC_FILES += jidctint.c jidctfst.c jidctred.c
-else
-ifeq ($(ANDROID_JPEG_USE_VENUM),true)
-LOCAL_SRC_FILES += jidctvenum.c
-LOCAL_SRC_FILES += asm/armv7/jdcolor-armv7.S
-LOCAL_SRC_FILES += asm/armv7/jdcolor-android-armv7.S
-LOCAL_SRC_FILES += asm/armv7/jdidct-armv7.S
-LOCAL_CFLAGS    += -DANDROID_JPEG_USE_VENUM
-else # ANDROID_JPEG_USE_VENUM, false
-LOCAL_SRC_FILES += jidctint.c jidctred.c jidctfst.c armv6_idct.S
-LOCAL_CFLAGS    += -DANDROID_ARMV6_IDCT
-endif # ANDROID_JPEG_USE_VENUM
-endif
-
-LOCAL_CFLAGS += -DAVOID_TABLES
-LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
-
-# enable tile based decode
-LOCAL_CFLAGS += -DANDROID_TILE_BASED_DECODE
-
-ifdef NEEDS_ARM_ERRATA_754319_754320
-asm_flags := \
-	--defsym NEEDS_ARM_ERRATA_754319_754320_ASM=1
-
-LOCAL_CFLAGS+= \
-	$(foreach f,$(asm_flags),-Wa,"$(f)")
-endif
-LOCAL_MODULE_TAGS := eng
-LOCAL_SHARED_LIBRARIES += libcutils
-LOCAL_MODULE:= libjpegtwrp
-
-include $(BUILD_STATIC_LIBRARY)
-
-- 
cgit v1.2.3