Remove config.h since it was conflicting with other Androidandroid-95ed21e84965f859da0792558742f9cbf9d4ac7a

components. From cyang.

2 files changed, 8 insertions, 143 deletions

diff --git a/Android.mk b/Android.mk
index f924e71..91804a7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,14 +16,11 @@ EXTRA_DIST = simd/nasm_lt.sh simd/jcclrmmx.asm simd/jcclrss2.asm simd/jdclrmmx.a
 libsimd_SOURCES_DIST = simd/jsimd_arm_neon.S \
                        simd/jsimd_arm.c 
 
-# or jsimd_none.c
-
- 
 LOCAL_SRC_FILES := $(libsimd_SOURCES_DIST)
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/simd
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/simd \
+                    $(LOCAL_PATH)/android
  
-LOCAL_CFLAGS := 
 AM_CFLAGS := -march=armv7-a -mfpu=neon
 AM_CCASFLAGS := -march=armv7-a -mfpu=neon
  
@@ -52,8 +49,6 @@ libjpeg_SOURCES_DIST =  jcapimin.c jcapistd.c jccoefct.c jccolor.c \
 	turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c \
 	turbojpeg-mapfile
 
-#possible adds jmem-android.c jmemnobs.c jmemmgr.c jmem-ashmem.c 
-
 LOCAL_SRC_FILES:= $(libjpeg_SOURCES_DIST)
  
 LOCAL_SHARED_LIBRARIES := libcutils
@@ -64,8 +59,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_CFLAGS := -DAVOID_TABLES  -O3 -fstrict-aliasing -fprefetch-loop-arrays  -DANDROID \
         -DANDROID_TILE_BASED_DECODE -DENABLE_ANDROID_NULL_CONVERT
 
-#-DANDROID_TILE_BASED_DECODE -DUSE_ANDROID_ASHMEM 
- 
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_STATIC_LIBRARY)
  
 LOCAL_MODULE_TAGS := debug
@@ -88,7 +81,8 @@ LOCAL_SRC_FILES:= $(cjpeg_SOURCES)
 
 LOCAL_SHARED_LIBRARIES := libjpeg
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) 
+LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+                    $(LOCAL_PATH)/android
 
 LOCAL_CFLAGS := -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED \
          -DANDROID -DANDROID_TILE_BASED_DECODE -DENABLE_ANDROID_NULL_CONVERT
@@ -115,7 +109,8 @@ LOCAL_SRC_FILES:= $(djpeg_SOURCES)
 
 LOCAL_SHARED_LIBRARIES := libjpeg
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) 
+LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+                    $(LOCAL_PATH)/android
 
 LOCAL_CFLAGS := -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED \
             -DANDROID -DANDROID_TILE_BASED_DECODE -DENABLE_ANDROID_NULL_CONVERT
@@ -141,7 +136,8 @@ LOCAL_SRC_FILES:= $(jpegtran_SOURCES)
 
 LOCAL_SHARED_LIBRARIES := libjpeg
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH) 
+LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+                    $(LOCAL_PATH)/android
 
 LOCAL_CFLAGS := -DANDROID -DANDROID_TILE_BASED_DECODE -DENABLE_ANDROID_NULL_CONVERT
 
diff --git a/config.h b/config.h
deleted file mode 100644
index 6e38c88..0000000
--- a/config.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Build number */
-#define BUILD "20110829"
-
-/* Support arithmetic encoding */
-#define C_ARITH_CODING_SUPPORTED 1
-
-/* Support arithmetic decoding */
-#define D_ARITH_CODING_SUPPORTED 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <jni.h> header file. */
-/* #undef HAVE_JNI_H */
-
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define if your compiler supports prototypes */
-#define HAVE_PROTOTYPES 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if the system has the type `unsigned char'. */
-#define HAVE_UNSIGNED_CHAR 1
-
-/* Define to 1 if the system has the type `unsigned short'. */
-#define HAVE_UNSIGNED_SHORT 1
-
-/* Compiler does not support pointers to undefined structures. */
-/* #undef INCOMPLETE_TYPES_BROKEN */
-
-/* libjpeg API version */
-#define JPEG_LIB_VERSION 62
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define if you have BSD-like bzero and bcopy */
-/* #undef NEED_BSD_STRINGS */
-
-/* Define if you need short function names */
-/* #undef NEED_SHORT_EXTERNAL_NAMES */
-
-/* Define if you have sys/types.h */
-#define NEED_SYS_TYPES_H 1
-
-/* Name of package */
-#define PACKAGE "libjpeg-turbo"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libjpeg-turbo"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libjpeg-turbo 1.1.90"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libjpeg-turbo"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.90"
-
-/* Define if shift is unsigned */
-/* #undef RIGHT_SHIFT_IS_UNSIGNED */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.1.90"
-
-/* Use accelerated SIMD routines. */
-#define WITH_SIMD 1
-
-/* Define to 1 if type `char' is unsigned and you are not using gcc.  */
-#ifndef __CHAR_UNSIGNED__
-/* # undef __CHAR_UNSIGNED__ */
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */