diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9d95a3c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+libjpeg-turbo-android/libjpeg-turbo/obj
+libjpeg-turbo-android/use-libjpeg-trubo-adnroid/obj
diff --git a/src/libjpeg-turbo/.project b/libjpeg-turbo-android/libjpeg-turbo/.project
similarity index 100%
rename from src/libjpeg-turbo/.project
rename to libjpeg-turbo-android/libjpeg-turbo/.project
diff --git a/src/libjpeg-turbo/AndroidManifest.xml b/libjpeg-turbo-android/libjpeg-turbo/AndroidManifest.xml
similarity index 100%
rename from src/libjpeg-turbo/AndroidManifest.xml
rename to libjpeg-turbo-android/libjpeg-turbo/AndroidManifest.xml
diff --git a/src/libjpeg-turbo/ic_launcher-web.png b/libjpeg-turbo-android/libjpeg-turbo/ic_launcher-web.png
similarity index 100%
rename from src/libjpeg-turbo/ic_launcher-web.png
rename to libjpeg-turbo-android/libjpeg-turbo/ic_launcher-web.png
diff --git a/src/libjpeg-turbo/jni/ANDROID.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/ANDROID.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/ANDROID.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/ANDROID.txt
diff --git a/src/libjpeg-turbo/jni/Android.mk b/libjpeg-turbo-android/libjpeg-turbo/jni/Android.mk
similarity index 95%
rename from src/libjpeg-turbo/jni/Android.mk
rename to libjpeg-turbo-android/libjpeg-turbo/jni/Android.mk
index 7c9920e..8d0b88a 100644
--- a/src/libjpeg-turbo/jni/Android.mk
+++ b/libjpeg-turbo-android/libjpeg-turbo/jni/Android.mk
@@ -34,7 +34,7 @@ LOCAL_MODULE := libsimd
 include $(BUILD_STATIC_LIBRARY)
  
 ######################################################
-###           libjpeg.so                       ##
+###           libjpegpi.so                       ##
 ######################################################
  
 include $(CLEAR_VARS)
@@ -66,7 +66,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_STATIC_LIBRARY)
  
 LOCAL_MODULE_TAGS := debug
  
-LOCAL_MODULE := libjpeg
+LOCAL_MODULE := libjpegpi
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -82,7 +82,7 @@ cjpeg_SOURCES = cdjpeg.c cjpeg.c rdbmp.c rdgif.c \
 
 LOCAL_SRC_FILES:= $(cjpeg_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpegpi
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/android
@@ -110,7 +110,7 @@ djpeg_SOURCES = cdjpeg.c djpeg.c rdcolmap.c rdswitch.c \
 
 LOCAL_SRC_FILES:= $(djpeg_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpegpi
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/android
@@ -137,7 +137,7 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c cdjpeg.c transupp.c
 
 LOCAL_SRC_FILES:= $(jpegtran_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpegpi
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/android
@@ -163,7 +163,7 @@ tjunittest_SOURCES = tjunittest.c tjutil.c
 
 LOCAL_SRC_FILES:= $(tjunittest_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpegpi
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
@@ -189,7 +189,7 @@ tjbench_SOURCES = tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c \
 
 LOCAL_SRC_FILES:= $(tjbench_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpegpi
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
@@ -215,7 +215,7 @@ rdjpgcom_SOURCES = rdjpgcom.c
 
 LOCAL_SRC_FILES:= $(rdjpgcom_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpegpi
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
@@ -240,7 +240,7 @@ wrjpgcom_SOURCES = wrjpgcom.c
 
 LOCAL_SRC_FILES:= $(wrjpgcom_SOURCES)
 
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_SHARED_LIBRARIES := libjpegpi
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) 
 
diff --git a/src/libjpeg-turbo/jni/BUILDING.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/BUILDING.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/BUILDING.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/BUILDING.txt
diff --git a/src/libjpeg-turbo/jni/CMakeLists.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/CMakeLists.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/CMakeLists.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/CMakeLists.txt
diff --git a/src/libjpeg-turbo/jni/ChangeLog.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/ChangeLog.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/ChangeLog.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/ChangeLog.txt
diff --git a/src/libjpeg-turbo/jni/Makefile.am b/libjpeg-turbo-android/libjpeg-turbo/jni/Makefile.am
similarity index 100%
rename from src/libjpeg-turbo/jni/Makefile.am
rename to libjpeg-turbo-android/libjpeg-turbo/jni/Makefile.am
diff --git a/src/libjpeg-turbo/jni/README b/libjpeg-turbo-android/libjpeg-turbo/jni/README
similarity index 100%
rename from src/libjpeg-turbo/jni/README
rename to libjpeg-turbo-android/libjpeg-turbo/jni/README
diff --git a/src/libjpeg-turbo/jni/README-turbo.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/README-turbo.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/README-turbo.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/README-turbo.txt
diff --git a/src/libjpeg-turbo/jni/acinclude.m4 b/libjpeg-turbo-android/libjpeg-turbo/jni/acinclude.m4
similarity index 100%
rename from src/libjpeg-turbo/jni/acinclude.m4
rename to libjpeg-turbo-android/libjpeg-turbo/jni/acinclude.m4
diff --git a/libjpeg-turbo/android/config.h b/libjpeg-turbo-android/libjpeg-turbo/jni/android/config.h
similarity index 100%
rename from libjpeg-turbo/android/config.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/android/config.h
diff --git a/libjpeg-turbo/android/jconfig.h b/libjpeg-turbo-android/libjpeg-turbo/jni/android/jconfig.h
similarity index 100%
rename from libjpeg-turbo/android/jconfig.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/android/jconfig.h
diff --git a/src/libjpeg-turbo/jni/bmp.c b/libjpeg-turbo-android/libjpeg-turbo/jni/bmp.c
similarity index 100%
rename from src/libjpeg-turbo/jni/bmp.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/bmp.c
diff --git a/src/libjpeg-turbo/jni/bmp.h b/libjpeg-turbo-android/libjpeg-turbo/jni/bmp.h
similarity index 100%
rename from src/libjpeg-turbo/jni/bmp.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/bmp.h
diff --git a/libjpeg-turbo/cderror.h b/libjpeg-turbo-android/libjpeg-turbo/jni/cderror.h
similarity index 100%
rename from libjpeg-turbo/cderror.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/cderror.h
diff --git a/src/libjpeg-turbo/jni/cdjpeg.c b/libjpeg-turbo-android/libjpeg-turbo/jni/cdjpeg.c
similarity index 100%
rename from src/libjpeg-turbo/jni/cdjpeg.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/cdjpeg.c
diff --git a/libjpeg-turbo/cdjpeg.h b/libjpeg-turbo-android/libjpeg-turbo/jni/cdjpeg.h
similarity index 100%
rename from libjpeg-turbo/cdjpeg.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/cdjpeg.h
diff --git a/src/libjpeg-turbo/jni/change.log b/libjpeg-turbo-android/libjpeg-turbo/jni/change.log
similarity index 100%
rename from src/libjpeg-turbo/jni/change.log
rename to libjpeg-turbo-android/libjpeg-turbo/jni/change.log
diff --git a/src/libjpeg-turbo/jni/cjpeg.1 b/libjpeg-turbo-android/libjpeg-turbo/jni/cjpeg.1
similarity index 100%
rename from src/libjpeg-turbo/jni/cjpeg.1
rename to libjpeg-turbo-android/libjpeg-turbo/jni/cjpeg.1
diff --git a/src/libjpeg-turbo/jni/cjpeg.c b/libjpeg-turbo-android/libjpeg-turbo/jni/cjpeg.c
similarity index 100%
rename from src/libjpeg-turbo/jni/cjpeg.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/cjpeg.c
diff --git a/src/libjpeg-turbo/jni/cmakescripts/getdate.bat b/libjpeg-turbo-android/libjpeg-turbo/jni/cmakescripts/getdate.bat
similarity index 100%
rename from src/libjpeg-turbo/jni/cmakescripts/getdate.bat
rename to libjpeg-turbo-android/libjpeg-turbo/jni/cmakescripts/getdate.bat
diff --git a/src/libjpeg-turbo/jni/cmakescripts/testclean.cmake b/libjpeg-turbo-android/libjpeg-turbo/jni/cmakescripts/testclean.cmake
similarity index 100%
rename from src/libjpeg-turbo/jni/cmakescripts/testclean.cmake
rename to libjpeg-turbo-android/libjpeg-turbo/jni/cmakescripts/testclean.cmake
diff --git a/src/libjpeg-turbo/jni/coderules.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/coderules.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/coderules.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/coderules.txt
diff --git a/src/libjpeg-turbo/jni/configure.ac b/libjpeg-turbo-android/libjpeg-turbo/jni/configure.ac
similarity index 100%
rename from src/libjpeg-turbo/jni/configure.ac
rename to libjpeg-turbo-android/libjpeg-turbo/jni/configure.ac
diff --git a/src/libjpeg-turbo/jni/debian/README.source b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/README.source
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/README.source
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/README.source
diff --git a/src/libjpeg-turbo/jni/debian/changelog b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/changelog
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/changelog
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/changelog
diff --git a/src/libjpeg-turbo/jni/debian/compat b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/compat
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/compat
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/compat
diff --git a/src/libjpeg-turbo/jni/debian/control b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/control
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/control
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/control
diff --git a/src/libjpeg-turbo/jni/debian/copyright b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/copyright
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/copyright
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/copyright
diff --git a/src/libjpeg-turbo/jni/debian/docs b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/docs
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/docs
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/docs
diff --git a/src/libjpeg-turbo/jni/debian/extra/Makefile b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/Makefile
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/extra/Makefile
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/Makefile
diff --git a/src/libjpeg-turbo/jni/debian/extra/exifautotran b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/exifautotran
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/extra/exifautotran
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/exifautotran
diff --git a/src/libjpeg-turbo/jni/debian/extra/exifautotran.1 b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/exifautotran.1
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/extra/exifautotran.1
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/exifautotran.1
diff --git a/src/libjpeg-turbo/jni/debian/extra/jpegexiforient.1 b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/jpegexiforient.1
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/extra/jpegexiforient.1
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/jpegexiforient.1
diff --git a/src/libjpeg-turbo/jni/debian/extra/jpegexiforient.c b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/jpegexiforient.c
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/extra/jpegexiforient.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/extra/jpegexiforient.c
diff --git a/src/libjpeg-turbo/jni/debian/libjpeg-turbo-only.symbols b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo-only.symbols
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libjpeg-turbo-only.symbols
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo-only.symbols
diff --git a/src/libjpeg-turbo/jni/debian/libjpeg-turbo-progs.install b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo-progs.install
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libjpeg-turbo-progs.install
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo-progs.install
diff --git a/src/libjpeg-turbo/jni/debian/libjpeg-turbo-test.install b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo-test.install
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libjpeg-turbo-test.install
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo-test.install
diff --git a/src/libjpeg-turbo/jni/debian/libjpeg-turbo8-dev.install b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8-dev.install
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libjpeg-turbo8-dev.install
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8-dev.install
diff --git a/src/libjpeg-turbo/jni/debian/libjpeg-turbo8.install b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8.install
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libjpeg-turbo8.install
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8.install
diff --git a/src/libjpeg-turbo/jni/debian/libjpeg-turbo8.lintian-overrides b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8.lintian-overrides
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libjpeg-turbo8.lintian-overrides
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8.lintian-overrides
diff --git a/src/libjpeg-turbo/jni/debian/libjpeg-turbo8.symbols b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8.symbols
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libjpeg-turbo8.symbols
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libjpeg-turbo8.symbols
diff --git a/src/libjpeg-turbo/jni/debian/libturbojpeg.install b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libturbojpeg.install
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libturbojpeg.install
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libturbojpeg.install
diff --git a/src/libjpeg-turbo/jni/debian/libturbojpeg.postinst b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libturbojpeg.postinst
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libturbojpeg.postinst
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libturbojpeg.postinst
diff --git a/src/libjpeg-turbo/jni/debian/libturbojpeg.postrm b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/libturbojpeg.postrm
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/libturbojpeg.postrm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/libturbojpeg.postrm
diff --git a/src/libjpeg-turbo/jni/debian/patches/FixLibraryStartup.patch b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/FixLibraryStartup.patch
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/patches/FixLibraryStartup.patch
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/FixLibraryStartup.patch
diff --git a/src/libjpeg-turbo/jni/debian/patches/add-copying-for-debian-dir.patch b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/add-copying-for-debian-dir.patch
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/patches/add-copying-for-debian-dir.patch
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/add-copying-for-debian-dir.patch
diff --git a/src/libjpeg-turbo/jni/debian/patches/series b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/series
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/patches/series
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/series
diff --git a/src/libjpeg-turbo/jni/debian/patches/tjunittest.patch b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/tjunittest.patch
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/patches/tjunittest.patch
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/patches/tjunittest.patch
diff --git a/src/libjpeg-turbo/jni/debian/rules b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/rules
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/rules
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/rules
diff --git a/src/libjpeg-turbo/jni/debian/source.lintian-overrides b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/source.lintian-overrides
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/source.lintian-overrides
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/source.lintian-overrides
diff --git a/src/libjpeg-turbo/jni/debian/source/format b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/source/format
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/source/format
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/source/format
diff --git a/src/libjpeg-turbo/jni/debian/watch b/libjpeg-turbo-android/libjpeg-turbo/jni/debian/watch
similarity index 100%
rename from src/libjpeg-turbo/jni/debian/watch
rename to libjpeg-turbo-android/libjpeg-turbo/jni/debian/watch
diff --git a/src/libjpeg-turbo/jni/djpeg.1 b/libjpeg-turbo-android/libjpeg-turbo/jni/djpeg.1
similarity index 100%
rename from src/libjpeg-turbo/jni/djpeg.1
rename to libjpeg-turbo-android/libjpeg-turbo/jni/djpeg.1
diff --git a/src/libjpeg-turbo/jni/djpeg.c b/libjpeg-turbo-android/libjpeg-turbo/jni/djpeg.c
similarity index 100%
rename from src/libjpeg-turbo/jni/djpeg.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/djpeg.c
diff --git a/src/libjpeg-turbo/jni/doc/html/annotated.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/annotated.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/annotated.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/annotated.html
diff --git a/src/libjpeg-turbo/jni/doc/html/bc_s.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/bc_s.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/bc_s.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/bc_s.png
diff --git a/src/libjpeg-turbo/jni/doc/html/classes.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/classes.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/classes.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/classes.html
diff --git a/src/libjpeg-turbo/jni/doc/html/closed.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/closed.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/closed.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/closed.png
diff --git a/src/libjpeg-turbo/jni/doc/html/doxygen.css b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/doxygen.css
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/doxygen.css
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/doxygen.css
diff --git a/src/libjpeg-turbo/jni/doc/html/doxygen.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/doxygen.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/doxygen.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/doxygen.png
diff --git a/src/libjpeg-turbo/jni/doc/html/functions.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/functions.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/functions.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/functions.html
diff --git a/src/libjpeg-turbo/jni/doc/html/functions_vars.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/functions_vars.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/functions_vars.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/functions_vars.html
diff --git a/src/libjpeg-turbo/jni/doc/html/group___turbo_j_p_e_g.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/group___turbo_j_p_e_g.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/group___turbo_j_p_e_g.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/group___turbo_j_p_e_g.html
diff --git a/src/libjpeg-turbo/jni/doc/html/index.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/index.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/index.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/index.html
diff --git a/src/libjpeg-turbo/jni/doc/html/installdox b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/installdox
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/installdox
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/installdox
diff --git a/src/libjpeg-turbo/jni/doc/html/jquery.js b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/jquery.js
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/jquery.js
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/jquery.js
diff --git a/src/libjpeg-turbo/jni/doc/html/modules.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/modules.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/modules.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/modules.html
diff --git a/src/libjpeg-turbo/jni/doc/html/nav_f.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/nav_f.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/nav_f.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/nav_f.png
diff --git a/src/libjpeg-turbo/jni/doc/html/nav_h.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/nav_h.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/nav_h.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/nav_h.png
diff --git a/src/libjpeg-turbo/jni/doc/html/open.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/open.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/open.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/open.png
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_63.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_63.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_63.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_63.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_64.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_64.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_64.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_64.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_68.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_68.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_68.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_68.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_6e.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_6e.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_6e.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_6e.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_6f.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_6f.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_6f.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_6f.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_72.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_72.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_72.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_72.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_74.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_74.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_74.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_74.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_77.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_77.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_77.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_77.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_78.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_78.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_78.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_78.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/all_79.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_79.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/all_79.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/all_79.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/classes_74.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/classes_74.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/classes_74.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/classes_74.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/close.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/close.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/close.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/close.png
diff --git a/src/libjpeg-turbo/jni/doc/html/search/mag_sel.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/mag_sel.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/mag_sel.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/mag_sel.png
diff --git a/src/libjpeg-turbo/jni/doc/html/search/nomatches.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/nomatches.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/nomatches.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/nomatches.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/search.css b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search.css
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/search.css
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search.css
diff --git a/src/libjpeg-turbo/jni/doc/html/search/search.js b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search.js
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/search.js
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search.js
diff --git a/src/libjpeg-turbo/jni/doc/html/search/search_l.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search_l.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/search_l.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search_l.png
diff --git a/src/libjpeg-turbo/jni/doc/html/search/search_m.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search_m.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/search_m.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search_m.png
diff --git a/src/libjpeg-turbo/jni/doc/html/search/search_r.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search_r.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/search_r.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/search_r.png
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_63.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_63.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_63.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_63.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_64.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_64.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_64.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_64.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_68.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_68.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_68.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_68.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_6e.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_6e.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_6e.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_6e.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_6f.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_6f.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_6f.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_6f.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_72.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_72.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_72.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_72.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_77.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_77.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_77.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_77.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_78.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_78.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_78.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_78.html
diff --git a/src/libjpeg-turbo/jni/doc/html/search/variables_79.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_79.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/search/variables_79.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/search/variables_79.html
diff --git a/src/libjpeg-turbo/jni/doc/html/structtjregion.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/structtjregion.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/structtjregion.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/structtjregion.html
diff --git a/src/libjpeg-turbo/jni/doc/html/structtjscalingfactor.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/structtjscalingfactor.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/structtjscalingfactor.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/structtjscalingfactor.html
diff --git a/src/libjpeg-turbo/jni/doc/html/structtjtransform.html b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/structtjtransform.html
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/structtjtransform.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/structtjtransform.html
diff --git a/src/libjpeg-turbo/jni/doc/html/tab_a.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_a.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/tab_a.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_a.png
diff --git a/src/libjpeg-turbo/jni/doc/html/tab_b.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_b.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/tab_b.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_b.png
diff --git a/src/libjpeg-turbo/jni/doc/html/tab_h.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_h.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/tab_h.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_h.png
diff --git a/src/libjpeg-turbo/jni/doc/html/tab_s.png b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_s.png
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/tab_s.png
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tab_s.png
diff --git a/src/libjpeg-turbo/jni/doc/html/tabs.css b/libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tabs.css
similarity index 100%
rename from src/libjpeg-turbo/jni/doc/html/tabs.css
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doc/html/tabs.css
diff --git a/src/libjpeg-turbo/jni/doxygen.config b/libjpeg-turbo-android/libjpeg-turbo/jni/doxygen.config
similarity index 100%
rename from src/libjpeg-turbo/jni/doxygen.config
rename to libjpeg-turbo-android/libjpeg-turbo/jni/doxygen.config
diff --git a/src/libjpeg-turbo/jni/example.c b/libjpeg-turbo-android/libjpeg-turbo/jni/example.c
similarity index 100%
rename from src/libjpeg-turbo/jni/example.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/example.c
diff --git a/src/libjpeg-turbo/jni/filelist.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/filelist.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/filelist.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/filelist.txt
diff --git a/src/libjpeg-turbo/jni/install.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/install.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/install.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/install.txt
diff --git a/src/libjpeg-turbo/jni/jaricom.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jaricom.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jaricom.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jaricom.c
diff --git a/src/libjpeg-turbo/jni/java/CMakeLists.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/java/CMakeLists.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/java/CMakeLists.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/CMakeLists.txt
diff --git a/src/libjpeg-turbo/jni/java/MANIFEST.MF b/libjpeg-turbo-android/libjpeg-turbo/jni/java/MANIFEST.MF
similarity index 100%
rename from src/libjpeg-turbo/jni/java/MANIFEST.MF
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/MANIFEST.MF
diff --git a/src/libjpeg-turbo/jni/java/Makefile.am b/libjpeg-turbo-android/libjpeg-turbo/jni/java/Makefile.am
similarity index 100%
rename from src/libjpeg-turbo/jni/java/Makefile.am
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/Makefile.am
diff --git a/src/libjpeg-turbo/jni/java/README b/libjpeg-turbo-android/libjpeg-turbo/jni/java/README
similarity index 100%
rename from src/libjpeg-turbo/jni/java/README
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/README
diff --git a/src/libjpeg-turbo/jni/java/TJExample.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/TJExample.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/TJExample.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/TJExample.java
diff --git a/src/libjpeg-turbo/jni/java/TJUnitTest.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/TJUnitTest.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/TJUnitTest.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/TJUnitTest.java
diff --git a/src/libjpeg-turbo/jni/java/doc/allclasses-frame.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/allclasses-frame.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/allclasses-frame.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/allclasses-frame.html
diff --git a/src/libjpeg-turbo/jni/java/doc/allclasses-noframe.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/allclasses-noframe.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/allclasses-noframe.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/allclasses-noframe.html
diff --git a/src/libjpeg-turbo/jni/java/doc/constant-values.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/constant-values.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/constant-values.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/constant-values.html
diff --git a/src/libjpeg-turbo/jni/java/doc/deprecated-list.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/deprecated-list.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/deprecated-list.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/deprecated-list.html
diff --git a/src/libjpeg-turbo/jni/java/doc/help-doc.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/help-doc.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/help-doc.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/help-doc.html
diff --git a/src/libjpeg-turbo/jni/java/doc/index-all.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/index-all.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/index-all.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/index-all.html
diff --git a/src/libjpeg-turbo/jni/java/doc/index.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/index.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/index.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/index.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJ.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJ.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJ.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJ.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCompressor.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJCustomFilter.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJDecompressor.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJScalingFactor.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransform.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/TJTransformer.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-frame.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-frame.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-frame.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-frame.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-summary.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-summary.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-summary.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-summary.html
diff --git a/src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-tree.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-tree.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-tree.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/org/libjpegturbo/turbojpeg/package-tree.html
diff --git a/src/libjpeg-turbo/jni/java/doc/overview-tree.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/overview-tree.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/overview-tree.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/overview-tree.html
diff --git a/src/libjpeg-turbo/jni/java/doc/package-list b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/package-list
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/package-list
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/package-list
diff --git a/src/libjpeg-turbo/jni/java/doc/resources/inherit.gif b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/resources/inherit.gif
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/resources/inherit.gif
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/resources/inherit.gif
diff --git a/src/libjpeg-turbo/jni/java/doc/serialized-form.html b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/serialized-form.html
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/serialized-form.html
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/serialized-form.html
diff --git a/src/libjpeg-turbo/jni/java/doc/stylesheet.css b/libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/stylesheet.css
similarity index 100%
rename from src/libjpeg-turbo/jni/java/doc/stylesheet.css
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/doc/stylesheet.css
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJ.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJ.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJ.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJ.java
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCompressor.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCompressor.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCompressor.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCompressor.java
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJCustomFilter.java
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJDecompressor.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJDecompressor.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJDecompressor.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJDecompressor.java
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java.in b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java.in
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJLoader.java.in
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJScalingFactor.java
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransform.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransform.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransform.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransform.java
diff --git a/src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransformer.java b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransformer.java
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransformer.java
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org/libjpegturbo/turbojpeg/TJTransformer.java
diff --git a/src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJ.h b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJ.h
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJ.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJ.h
diff --git a/src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJCompressor.h b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJCompressor.h
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJCompressor.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJCompressor.h
diff --git a/src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJDecompressor.h b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJDecompressor.h
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJDecompressor.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJDecompressor.h
diff --git a/src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJTransformer.h b/libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJTransformer.h
similarity index 100%
rename from src/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJTransformer.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/java/org_libjpegturbo_turbojpeg_TJTransformer.h
diff --git a/src/libjpeg-turbo/jni/jcapimin.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcapimin.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcapimin.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcapimin.c
diff --git a/src/libjpeg-turbo/jni/jcapistd.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcapistd.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcapistd.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcapistd.c
diff --git a/src/libjpeg-turbo/jni/jcarith.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcarith.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcarith.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcarith.c
diff --git a/src/libjpeg-turbo/jni/jccoefct.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jccoefct.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jccoefct.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jccoefct.c
diff --git a/src/libjpeg-turbo/jni/jccolext.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jccolext.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jccolext.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jccolext.c
diff --git a/src/libjpeg-turbo/jni/jccolor.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jccolor.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jccolor.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jccolor.c
diff --git a/src/libjpeg-turbo/jni/jcdctmgr.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcdctmgr.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcdctmgr.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcdctmgr.c
diff --git a/src/libjpeg-turbo/jni/jchuff.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jchuff.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jchuff.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jchuff.c
diff --git a/src/libjpeg-turbo/jni/jchuff.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jchuff.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jchuff.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jchuff.h
diff --git a/src/libjpeg-turbo/jni/jcinit.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcinit.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcinit.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcinit.c
diff --git a/src/libjpeg-turbo/jni/jcmainct.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcmainct.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcmainct.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcmainct.c
diff --git a/src/libjpeg-turbo/jni/jcmarker.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcmarker.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcmarker.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcmarker.c
diff --git a/src/libjpeg-turbo/jni/jcmaster.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcmaster.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcmaster.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcmaster.c
diff --git a/src/libjpeg-turbo/jni/jcomapi.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcomapi.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcomapi.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcomapi.c
diff --git a/libjpeg-turbo/jconfig.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jconfig.h
similarity index 100%
rename from libjpeg-turbo/jconfig.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jconfig.h
diff --git a/src/libjpeg-turbo/jni/jconfig.h.in b/libjpeg-turbo-android/libjpeg-turbo/jni/jconfig.h.in
similarity index 100%
rename from src/libjpeg-turbo/jni/jconfig.h.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jconfig.h.in
diff --git a/src/libjpeg-turbo/jni/jconfig.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/jconfig.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/jconfig.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jconfig.txt
diff --git a/src/libjpeg-turbo/jni/jcparam.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcparam.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcparam.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcparam.c
diff --git a/src/libjpeg-turbo/jni/jcphuff.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcphuff.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcphuff.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcphuff.c
diff --git a/src/libjpeg-turbo/jni/jcprepct.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcprepct.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcprepct.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcprepct.c
diff --git a/src/libjpeg-turbo/jni/jcsample.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcsample.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcsample.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcsample.c
diff --git a/src/libjpeg-turbo/jni/jcstest.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jcstest.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jcstest.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jcstest.c
diff --git a/src/libjpeg-turbo/jni/jctrans.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jctrans.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jctrans.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jctrans.c
diff --git a/src/libjpeg-turbo/jni/jdapimin.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdapimin.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdapimin.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdapimin.c
diff --git a/src/libjpeg-turbo/jni/jdapistd.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdapistd.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdapistd.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdapistd.c
diff --git a/src/libjpeg-turbo/jni/jdarith.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdarith.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdarith.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdarith.c
diff --git a/src/libjpeg-turbo/jni/jdatadst-tj.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdatadst-tj.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdatadst-tj.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdatadst-tj.c
diff --git a/src/libjpeg-turbo/jni/jdatadst.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdatadst.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdatadst.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdatadst.c
diff --git a/src/libjpeg-turbo/jni/jdatasrc-tj.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdatasrc-tj.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdatasrc-tj.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdatasrc-tj.c
diff --git a/src/libjpeg-turbo/jni/jdatasrc.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdatasrc.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdatasrc.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdatasrc.c
diff --git a/src/libjpeg-turbo/jni/jdcoefct.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdcoefct.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdcoefct.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdcoefct.c
diff --git a/src/libjpeg-turbo/jni/jdcolext.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdcolext.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdcolext.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdcolext.c
diff --git a/src/libjpeg-turbo/jni/jdcolor.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdcolor.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdcolor.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdcolor.c
diff --git a/src/libjpeg-turbo/jni/jdct.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jdct.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jdct.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdct.h
diff --git a/src/libjpeg-turbo/jni/jddctmgr.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jddctmgr.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jddctmgr.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jddctmgr.c
diff --git a/src/libjpeg-turbo/jni/jdhuff.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdhuff.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdhuff.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdhuff.c
diff --git a/src/libjpeg-turbo/jni/jdhuff.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jdhuff.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jdhuff.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdhuff.h
diff --git a/src/libjpeg-turbo/jni/jdinput.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdinput.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdinput.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdinput.c
diff --git a/src/libjpeg-turbo/jni/jdmainct.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdmainct.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdmainct.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdmainct.c
diff --git a/src/libjpeg-turbo/jni/jdmarker.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdmarker.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdmarker.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdmarker.c
diff --git a/src/libjpeg-turbo/jni/jdmaster.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdmaster.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdmaster.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdmaster.c
diff --git a/src/libjpeg-turbo/jni/jdmerge.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdmerge.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdmerge.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdmerge.c
diff --git a/src/libjpeg-turbo/jni/jdmrgext.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdmrgext.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdmrgext.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdmrgext.c
diff --git a/src/libjpeg-turbo/jni/jdphuff.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdphuff.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdphuff.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdphuff.c
diff --git a/src/libjpeg-turbo/jni/jdpostct.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdpostct.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdpostct.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdpostct.c
diff --git a/src/libjpeg-turbo/jni/jdsample.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdsample.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdsample.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdsample.c
diff --git a/src/libjpeg-turbo/jni/jdtrans.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jdtrans.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jdtrans.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jdtrans.c
diff --git a/src/libjpeg-turbo/jni/jerror.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jerror.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jerror.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jerror.c
diff --git a/libjpeg-turbo/jerror.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jerror.h
similarity index 100%
rename from libjpeg-turbo/jerror.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jerror.h
diff --git a/src/libjpeg-turbo/jni/jfdctflt.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jfdctflt.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jfdctflt.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jfdctflt.c
diff --git a/src/libjpeg-turbo/jni/jfdctfst.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jfdctfst.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jfdctfst.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jfdctfst.c
diff --git a/src/libjpeg-turbo/jni/jfdctint.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jfdctint.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jfdctint.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jfdctint.c
diff --git a/src/libjpeg-turbo/jni/jidctflt.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jidctflt.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jidctflt.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jidctflt.c
diff --git a/src/libjpeg-turbo/jni/jidctfst.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jidctfst.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jidctfst.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jidctfst.c
diff --git a/src/libjpeg-turbo/jni/jidctint.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jidctint.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jidctint.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jidctint.c
diff --git a/src/libjpeg-turbo/jni/jidctred.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jidctred.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jidctred.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jidctred.c
diff --git a/libjpeg-turbo/jinclude.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jinclude.h
similarity index 100%
rename from libjpeg-turbo/jinclude.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jinclude.h
diff --git a/src/libjpeg-turbo/jni/jmemmgr.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jmemmgr.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jmemmgr.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jmemmgr.c
diff --git a/src/libjpeg-turbo/jni/jmemnobs.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jmemnobs.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jmemnobs.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jmemnobs.c
diff --git a/src/libjpeg-turbo/jni/jmemsys.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jmemsys.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jmemsys.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jmemsys.h
diff --git a/libjpeg-turbo/jmorecfg.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jmorecfg.h
similarity index 100%
rename from libjpeg-turbo/jmorecfg.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jmorecfg.h
diff --git a/src/libjpeg-turbo/jni/jpegcomp.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jpegcomp.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jpegcomp.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jpegcomp.h
diff --git a/src/libjpeg-turbo/jni/jpegint.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jpegint.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jpegint.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jpegint.h
diff --git a/libjpeg-turbo/jpeglib.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jpeglib.h
similarity index 100%
rename from libjpeg-turbo/jpeglib.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jpeglib.h
diff --git a/src/libjpeg-turbo/jni/jpegtran.1 b/libjpeg-turbo-android/libjpeg-turbo/jni/jpegtran.1
similarity index 100%
rename from src/libjpeg-turbo/jni/jpegtran.1
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jpegtran.1
diff --git a/src/libjpeg-turbo/jni/jpegtran.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jpegtran.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jpegtran.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jpegtran.c
diff --git a/src/libjpeg-turbo/jni/jquant1.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jquant1.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jquant1.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jquant1.c
diff --git a/src/libjpeg-turbo/jni/jquant2.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jquant2.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jquant2.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jquant2.c
diff --git a/src/libjpeg-turbo/jni/jsimd.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jsimd.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jsimd.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jsimd.h
diff --git a/src/libjpeg-turbo/jni/jsimd_none.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jsimd_none.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jsimd_none.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jsimd_none.c
diff --git a/src/libjpeg-turbo/jni/jsimddct.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jsimddct.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jsimddct.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jsimddct.h
diff --git a/src/libjpeg-turbo/jni/jutils.c b/libjpeg-turbo-android/libjpeg-turbo/jni/jutils.c
similarity index 100%
rename from src/libjpeg-turbo/jni/jutils.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jutils.c
diff --git a/libjpeg-turbo/jversion.h b/libjpeg-turbo-android/libjpeg-turbo/jni/jversion.h
similarity index 100%
rename from libjpeg-turbo/jversion.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/jversion.h
diff --git a/src/libjpeg-turbo/jni/libjpeg.map.in b/libjpeg-turbo-android/libjpeg-turbo/jni/libjpeg.map.in
similarity index 100%
rename from src/libjpeg-turbo/jni/libjpeg.map.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/libjpeg.map.in
diff --git a/src/libjpeg-turbo/jni/libjpeg.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/libjpeg.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/libjpeg.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/libjpeg.txt
diff --git a/src/libjpeg-turbo/jni/machine/cpu-features.h b/libjpeg-turbo-android/libjpeg-turbo/jni/machine/cpu-features.h
similarity index 100%
rename from src/libjpeg-turbo/jni/machine/cpu-features.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/machine/cpu-features.h
diff --git a/src/libjpeg-turbo/jni/pkgscripts/Description.plist b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/Description.plist
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/Description.plist
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/Description.plist
diff --git a/src/libjpeg-turbo/jni/pkgscripts/Info.plist b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/Info.plist
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/Info.plist
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/Info.plist
diff --git a/src/libjpeg-turbo/jni/pkgscripts/deb-control b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/deb-control
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/deb-control
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/deb-control
diff --git a/src/libjpeg-turbo/jni/pkgscripts/libjpeg-turbo.spec b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/libjpeg-turbo.spec
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/libjpeg-turbo.spec
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/libjpeg-turbo.spec
diff --git a/src/libjpeg-turbo/jni/pkgscripts/makecygwinpkg b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makecygwinpkg
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/makecygwinpkg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makecygwinpkg
diff --git a/src/libjpeg-turbo/jni/pkgscripts/makedpkg b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makedpkg
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/makedpkg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makedpkg
diff --git a/src/libjpeg-turbo/jni/pkgscripts/makemacpkg b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makemacpkg
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/makemacpkg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makemacpkg
diff --git a/src/libjpeg-turbo/jni/pkgscripts/makesunpkg b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makesunpkg
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/makesunpkg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/makesunpkg
diff --git a/src/libjpeg-turbo/jni/pkgscripts/pkginfo b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/pkginfo
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/pkginfo
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/pkginfo
diff --git a/src/libjpeg-turbo/jni/pkgscripts/uninstall b/libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/uninstall
similarity index 100%
rename from src/libjpeg-turbo/jni/pkgscripts/uninstall
rename to libjpeg-turbo-android/libjpeg-turbo/jni/pkgscripts/uninstall
diff --git a/src/libjpeg-turbo/jni/rdbmp.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdbmp.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdbmp.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdbmp.c
diff --git a/src/libjpeg-turbo/jni/rdcolmap.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdcolmap.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdcolmap.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdcolmap.c
diff --git a/src/libjpeg-turbo/jni/rdgif.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdgif.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdgif.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdgif.c
diff --git a/src/libjpeg-turbo/jni/rdjpgcom.1 b/libjpeg-turbo-android/libjpeg-turbo/jni/rdjpgcom.1
similarity index 100%
rename from src/libjpeg-turbo/jni/rdjpgcom.1
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdjpgcom.1
diff --git a/src/libjpeg-turbo/jni/rdjpgcom.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdjpgcom.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdjpgcom.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdjpgcom.c
diff --git a/src/libjpeg-turbo/jni/rdppm.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdppm.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdppm.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdppm.c
diff --git a/src/libjpeg-turbo/jni/rdrle.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdrle.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdrle.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdrle.c
diff --git a/src/libjpeg-turbo/jni/rdswitch.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdswitch.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdswitch.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdswitch.c
diff --git a/src/libjpeg-turbo/jni/rdtarga.c b/libjpeg-turbo-android/libjpeg-turbo/jni/rdtarga.c
similarity index 100%
rename from src/libjpeg-turbo/jni/rdtarga.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/rdtarga.c
diff --git a/src/libjpeg-turbo/jni/release/Description.plist.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/Description.plist.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/Description.plist.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/Description.plist.in
diff --git a/src/libjpeg-turbo/jni/release/Info.plist.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/Info.plist.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/Info.plist.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/Info.plist.in
diff --git a/src/libjpeg-turbo/jni/release/License.rtf b/libjpeg-turbo-android/libjpeg-turbo/jni/release/License.rtf
similarity index 100%
rename from src/libjpeg-turbo/jni/release/License.rtf
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/License.rtf
diff --git a/src/libjpeg-turbo/jni/release/ReadMe.rtf b/libjpeg-turbo-android/libjpeg-turbo/jni/release/ReadMe.rtf
similarity index 100%
rename from src/libjpeg-turbo/jni/release/ReadMe.rtf
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/ReadMe.rtf
diff --git a/src/libjpeg-turbo/jni/release/Welcome.rtf b/libjpeg-turbo-android/libjpeg-turbo/jni/release/Welcome.rtf
similarity index 100%
rename from src/libjpeg-turbo/jni/release/Welcome.rtf
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/Welcome.rtf
diff --git a/src/libjpeg-turbo/jni/release/copyright b/libjpeg-turbo-android/libjpeg-turbo/jni/release/copyright
similarity index 100%
rename from src/libjpeg-turbo/jni/release/copyright
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/copyright
diff --git a/src/libjpeg-turbo/jni/release/deb-control.tmpl b/libjpeg-turbo-android/libjpeg-turbo/jni/release/deb-control.tmpl
similarity index 100%
rename from src/libjpeg-turbo/jni/release/deb-control.tmpl
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/deb-control.tmpl
diff --git a/src/libjpeg-turbo/jni/release/libjpeg-turbo.nsi.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/libjpeg-turbo.nsi.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/libjpeg-turbo.nsi.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/libjpeg-turbo.nsi.in
diff --git a/src/libjpeg-turbo/jni/release/libjpeg-turbo.spec.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/libjpeg-turbo.spec.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/libjpeg-turbo.spec.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/libjpeg-turbo.spec.in
diff --git a/src/libjpeg-turbo/jni/release/makecygwinpkg.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/makecygwinpkg.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/makecygwinpkg.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/makecygwinpkg.in
diff --git a/src/libjpeg-turbo/jni/release/makedpkg.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/makedpkg.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/makedpkg.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/makedpkg.in
diff --git a/src/libjpeg-turbo/jni/release/makemacpkg.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/makemacpkg.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/makemacpkg.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/makemacpkg.in
diff --git a/src/libjpeg-turbo/jni/release/makesunpkg.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/makesunpkg.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/makesunpkg.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/makesunpkg.in
diff --git a/src/libjpeg-turbo/jni/release/pkginfo.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/pkginfo.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/pkginfo.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/pkginfo.in
diff --git a/src/libjpeg-turbo/jni/release/uninstall.in b/libjpeg-turbo-android/libjpeg-turbo/jni/release/uninstall.in
similarity index 100%
rename from src/libjpeg-turbo/jni/release/uninstall.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/release/uninstall.in
diff --git a/src/libjpeg-turbo/jni/sharedlib/CMakeLists.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/sharedlib/CMakeLists.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/sharedlib/CMakeLists.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/sharedlib/CMakeLists.txt
diff --git a/src/libjpeg-turbo/jni/simd/CMakeLists.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/CMakeLists.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/CMakeLists.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/CMakeLists.txt
diff --git a/src/libjpeg-turbo/jni/simd/Makefile.am b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/Makefile.am
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/Makefile.am
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/Makefile.am
diff --git a/src/libjpeg-turbo/jni/simd/jcclrmmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcclrmmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcclrmmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcclrmmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcclrss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcclrss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcclrss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcclrss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcclrss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcclrss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcclrss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcclrss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jccolmmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jccolmmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jccolmmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jccolmmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jccolss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jccolss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jccolss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jccolss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jccolss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jccolss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jccolss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jccolss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcgrammx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrammx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcgrammx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrammx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcgrass2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrass2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcgrass2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrass2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcgrass2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrass2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcgrass2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrass2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcgrymmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrymmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcgrymmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgrymmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcgryss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgryss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcgryss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgryss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcgryss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgryss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcgryss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcgryss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcolsamp.inc b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcolsamp.inc
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcolsamp.inc
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcolsamp.inc
diff --git a/src/libjpeg-turbo/jni/simd/jcqnt3dn.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnt3dn.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcqnt3dn.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnt3dn.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcqntmmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqntmmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcqntmmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqntmmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcqnts2f-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2f-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcqnts2f-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2f-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcqnts2f.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2f.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcqnts2f.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2f.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcqnts2i-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2i-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcqnts2i-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2i-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcqnts2i.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2i.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcqnts2i.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqnts2i.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcqntsse.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqntsse.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcqntsse.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcqntsse.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcsammmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcsammmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcsammmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcsammmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcsamss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcsamss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcsamss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcsamss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jcsamss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcsamss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jcsamss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jcsamss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdclrmmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdclrmmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdclrmmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdclrmmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdclrss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdclrss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdclrss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdclrss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdclrss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdclrss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdclrss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdclrss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdcolmmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdcolmmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdcolmmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdcolmmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdcolss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdcolss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdcolss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdcolss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdcolss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdcolss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdcolss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdcolss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdct.inc b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdct.inc
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdct.inc
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdct.inc
diff --git a/src/libjpeg-turbo/jni/simd/jdmermmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmermmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdmermmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmermmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdmerss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmerss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdmerss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmerss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdmerss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmerss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdmerss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmerss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdmrgmmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmrgmmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdmrgmmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmrgmmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdmrgss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmrgss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdmrgss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmrgss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdmrgss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmrgss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdmrgss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdmrgss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdsammmx.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdsammmx.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdsammmx.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdsammmx.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdsamss2-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdsamss2-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdsamss2-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdsamss2-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jdsamss2.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdsamss2.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jdsamss2.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jdsamss2.asm
diff --git a/src/libjpeg-turbo/jni/simd/jf3dnflt.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jf3dnflt.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jf3dnflt.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jf3dnflt.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfmmxfst.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfmmxfst.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfmmxfst.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfmmxfst.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfmmxint.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfmmxint.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfmmxint.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfmmxint.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfss2fst-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2fst-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfss2fst-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2fst-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfss2fst.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2fst.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfss2fst.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2fst.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfss2int-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2int-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfss2int-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2int-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfss2int.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2int.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfss2int.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfss2int.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfsseflt-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfsseflt-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfsseflt-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfsseflt-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jfsseflt.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfsseflt.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jfsseflt.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jfsseflt.asm
diff --git a/src/libjpeg-turbo/jni/simd/ji3dnflt.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/ji3dnflt.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/ji3dnflt.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/ji3dnflt.asm
diff --git a/src/libjpeg-turbo/jni/simd/jimmxfst.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jimmxfst.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jimmxfst.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jimmxfst.asm
diff --git a/src/libjpeg-turbo/jni/simd/jimmxint.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jimmxint.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jimmxint.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jimmxint.asm
diff --git a/src/libjpeg-turbo/jni/simd/jimmxred.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jimmxred.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jimmxred.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jimmxred.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2flt-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2flt-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2flt-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2flt-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2flt.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2flt.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2flt.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2flt.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2fst-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2fst-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2fst-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2fst-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2fst.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2fst.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2fst.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2fst.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2int-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2int-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2int-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2int-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2int.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2int.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2int.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2int.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2red-64.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2red-64.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2red-64.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2red-64.asm
diff --git a/src/libjpeg-turbo/jni/simd/jiss2red.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2red.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jiss2red.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jiss2red.asm
diff --git a/src/libjpeg-turbo/jni/simd/jisseflt.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jisseflt.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jisseflt.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jisseflt.asm
diff --git a/src/libjpeg-turbo/jni/simd/jsimd.h b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd.h
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimd.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd.h
diff --git a/src/libjpeg-turbo/jni/simd/jsimd_arm.c b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_arm.c
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimd_arm.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_arm.c
diff --git a/src/libjpeg-turbo/jni/simd/jsimd_arm_neon.S b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_arm_neon.S
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimd_arm_neon.S
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_arm_neon.S
diff --git a/src/libjpeg-turbo/jni/simd/jsimd_i386.c b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_i386.c
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimd_i386.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_i386.c
diff --git a/src/libjpeg-turbo/jni/simd/jsimd_x86_64.c b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_x86_64.c
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimd_x86_64.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimd_x86_64.c
diff --git a/src/libjpeg-turbo/jni/simd/jsimdcfg.inc.h b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimdcfg.inc.h
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimdcfg.inc.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimdcfg.inc.h
diff --git a/src/libjpeg-turbo/jni/simd/jsimdcpu.asm b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimdcpu.asm
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimdcpu.asm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimdcpu.asm
diff --git a/src/libjpeg-turbo/jni/simd/jsimdext.inc b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimdext.inc
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/jsimdext.inc
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/jsimdext.inc
diff --git a/src/libjpeg-turbo/jni/simd/nasm_lt.sh b/libjpeg-turbo-android/libjpeg-turbo/jni/simd/nasm_lt.sh
similarity index 100%
rename from src/libjpeg-turbo/jni/simd/nasm_lt.sh
rename to libjpeg-turbo-android/libjpeg-turbo/jni/simd/nasm_lt.sh
diff --git a/src/libjpeg-turbo/jni/structure.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/structure.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/structure.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/structure.txt
diff --git a/src/libjpeg-turbo/jni/testimg.bmp b/libjpeg-turbo-android/libjpeg-turbo/jni/testimg.bmp
similarity index 100%
rename from src/libjpeg-turbo/jni/testimg.bmp
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimg.bmp
diff --git a/src/libjpeg-turbo/jni/testimgari.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgari.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgari.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgari.jpg
diff --git a/src/libjpeg-turbo/jni/testimgari.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgari.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgari.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgari.ppm
diff --git a/src/libjpeg-turbo/jni/testimgcrop.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgcrop.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgcrop.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgcrop.jpg
diff --git a/src/libjpeg-turbo/jni/testimgflt-nosimd.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgflt-nosimd.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgflt-nosimd.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgflt-nosimd.jpg
diff --git a/src/libjpeg-turbo/jni/testimgflt.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgflt.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgflt.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgflt.jpg
diff --git a/src/libjpeg-turbo/jni/testimgflt.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgflt.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgflt.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgflt.ppm
diff --git a/src/libjpeg-turbo/jni/testimgfst.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgfst.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst.jpg
diff --git a/src/libjpeg-turbo/jni/testimgfst.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgfst.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst.ppm
diff --git a/src/libjpeg-turbo/jni/testimgfst100.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst100.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgfst100.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst100.jpg
diff --git a/src/libjpeg-turbo/jni/testimgfst1_2.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst1_2.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgfst1_2.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst1_2.ppm
diff --git a/src/libjpeg-turbo/jni/testimgfst1_4.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst1_4.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgfst1_4.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst1_4.ppm
diff --git a/src/libjpeg-turbo/jni/testimgfst1_8.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst1_8.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgfst1_8.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgfst1_8.ppm
diff --git a/src/libjpeg-turbo/jni/testimggray.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimggray.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimggray.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimggray.jpg
diff --git a/src/libjpeg-turbo/jni/testimgint.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgint.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgint.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgint.jpg
diff --git a/src/libjpeg-turbo/jni/testimgint.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgint.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgint.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgint.ppm
diff --git a/src/libjpeg-turbo/jni/testimgint1_2.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgint1_2.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgint1_2.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgint1_2.ppm
diff --git a/src/libjpeg-turbo/jni/testimgint1_4.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgint1_4.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgint1_4.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgint1_4.ppm
diff --git a/src/libjpeg-turbo/jni/testimgint1_8.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgint1_8.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgint1_8.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgint1_8.ppm
diff --git a/src/libjpeg-turbo/jni/testimgp.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testimgp.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testimgp.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testimgp.jpg
diff --git a/src/libjpeg-turbo/jni/testorig.jpg b/libjpeg-turbo-android/libjpeg-turbo/jni/testorig.jpg
similarity index 100%
rename from src/libjpeg-turbo/jni/testorig.jpg
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testorig.jpg
diff --git a/src/libjpeg-turbo/jni/testorig.ppm b/libjpeg-turbo-android/libjpeg-turbo/jni/testorig.ppm
similarity index 100%
rename from src/libjpeg-turbo/jni/testorig.ppm
rename to libjpeg-turbo-android/libjpeg-turbo/jni/testorig.ppm
diff --git a/src/libjpeg-turbo/jni/tjbench-libjpeg62 b/libjpeg-turbo-android/libjpeg-turbo/jni/tjbench-libjpeg62
similarity index 100%
rename from src/libjpeg-turbo/jni/tjbench-libjpeg62
rename to libjpeg-turbo-android/libjpeg-turbo/jni/tjbench-libjpeg62
diff --git a/src/libjpeg-turbo/jni/tjbench.c b/libjpeg-turbo-android/libjpeg-turbo/jni/tjbench.c
similarity index 100%
rename from src/libjpeg-turbo/jni/tjbench.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/tjbench.c
diff --git a/src/libjpeg-turbo/jni/tjunittest.c b/libjpeg-turbo-android/libjpeg-turbo/jni/tjunittest.c
similarity index 100%
rename from src/libjpeg-turbo/jni/tjunittest.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/tjunittest.c
diff --git a/src/libjpeg-turbo/jni/tjutil.c b/libjpeg-turbo-android/libjpeg-turbo/jni/tjutil.c
similarity index 100%
rename from src/libjpeg-turbo/jni/tjutil.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/tjutil.c
diff --git a/src/libjpeg-turbo/jni/tjutil.h b/libjpeg-turbo-android/libjpeg-turbo/jni/tjutil.h
similarity index 100%
rename from src/libjpeg-turbo/jni/tjutil.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/tjutil.h
diff --git a/src/libjpeg-turbo/jni/transupp.c b/libjpeg-turbo-android/libjpeg-turbo/jni/transupp.c
similarity index 100%
rename from src/libjpeg-turbo/jni/transupp.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/transupp.c
diff --git a/src/libjpeg-turbo/jni/transupp.h b/libjpeg-turbo-android/libjpeg-turbo/jni/transupp.h
similarity index 100%
rename from src/libjpeg-turbo/jni/transupp.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/transupp.h
diff --git a/src/libjpeg-turbo/jni/turbojpeg-jni.c b/libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg-jni.c
similarity index 100%
rename from src/libjpeg-turbo/jni/turbojpeg-jni.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg-jni.c
diff --git a/src/libjpeg-turbo/jni/turbojpeg-mapfile b/libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg-mapfile
similarity index 100%
rename from src/libjpeg-turbo/jni/turbojpeg-mapfile
rename to libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg-mapfile
diff --git a/src/libjpeg-turbo/jni/turbojpeg-mapfile.jni b/libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg-mapfile.jni
similarity index 100%
rename from src/libjpeg-turbo/jni/turbojpeg-mapfile.jni
rename to libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg-mapfile.jni
diff --git a/src/libjpeg-turbo/jni/turbojpeg.c b/libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg.c
similarity index 100%
rename from src/libjpeg-turbo/jni/turbojpeg.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg.c
diff --git a/src/libjpeg-turbo/jni/turbojpeg.h b/libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg.h
similarity index 100%
rename from src/libjpeg-turbo/jni/turbojpeg.h
rename to libjpeg-turbo-android/libjpeg-turbo/jni/turbojpeg.h
diff --git a/src/libjpeg-turbo/jni/usage.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/usage.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/usage.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/usage.txt
diff --git a/src/libjpeg-turbo/jni/win/config.h.in b/libjpeg-turbo-android/libjpeg-turbo/jni/win/config.h.in
similarity index 100%
rename from src/libjpeg-turbo/jni/win/config.h.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/win/config.h.in
diff --git a/src/libjpeg-turbo/jni/win/jconfig.h.in b/libjpeg-turbo-android/libjpeg-turbo/jni/win/jconfig.h.in
similarity index 100%
rename from src/libjpeg-turbo/jni/win/jconfig.h.in
rename to libjpeg-turbo-android/libjpeg-turbo/jni/win/jconfig.h.in
diff --git a/src/libjpeg-turbo/jni/win/jpeg62.def b/libjpeg-turbo-android/libjpeg-turbo/jni/win/jpeg62.def
similarity index 100%
rename from src/libjpeg-turbo/jni/win/jpeg62.def
rename to libjpeg-turbo-android/libjpeg-turbo/jni/win/jpeg62.def
diff --git a/src/libjpeg-turbo/jni/win/jpeg7.def b/libjpeg-turbo-android/libjpeg-turbo/jni/win/jpeg7.def
similarity index 100%
rename from src/libjpeg-turbo/jni/win/jpeg7.def
rename to libjpeg-turbo-android/libjpeg-turbo/jni/win/jpeg7.def
diff --git a/src/libjpeg-turbo/jni/win/jpeg8.def b/libjpeg-turbo-android/libjpeg-turbo/jni/win/jpeg8.def
similarity index 100%
rename from src/libjpeg-turbo/jni/win/jpeg8.def
rename to libjpeg-turbo-android/libjpeg-turbo/jni/win/jpeg8.def
diff --git a/src/libjpeg-turbo/jni/win/jsimdcfg.inc b/libjpeg-turbo-android/libjpeg-turbo/jni/win/jsimdcfg.inc
similarity index 100%
rename from src/libjpeg-turbo/jni/win/jsimdcfg.inc
rename to libjpeg-turbo-android/libjpeg-turbo/jni/win/jsimdcfg.inc
diff --git a/src/libjpeg-turbo/jni/wizard.txt b/libjpeg-turbo-android/libjpeg-turbo/jni/wizard.txt
similarity index 100%
rename from src/libjpeg-turbo/jni/wizard.txt
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wizard.txt
diff --git a/src/libjpeg-turbo/jni/wrbmp.c b/libjpeg-turbo-android/libjpeg-turbo/jni/wrbmp.c
similarity index 100%
rename from src/libjpeg-turbo/jni/wrbmp.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wrbmp.c
diff --git a/src/libjpeg-turbo/jni/wrgif.c b/libjpeg-turbo-android/libjpeg-turbo/jni/wrgif.c
similarity index 100%
rename from src/libjpeg-turbo/jni/wrgif.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wrgif.c
diff --git a/src/libjpeg-turbo/jni/wrjpgcom.1 b/libjpeg-turbo-android/libjpeg-turbo/jni/wrjpgcom.1
similarity index 100%
rename from src/libjpeg-turbo/jni/wrjpgcom.1
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wrjpgcom.1
diff --git a/src/libjpeg-turbo/jni/wrjpgcom.c b/libjpeg-turbo-android/libjpeg-turbo/jni/wrjpgcom.c
similarity index 100%
rename from src/libjpeg-turbo/jni/wrjpgcom.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wrjpgcom.c
diff --git a/src/libjpeg-turbo/jni/wrppm.c b/libjpeg-turbo-android/libjpeg-turbo/jni/wrppm.c
similarity index 100%
rename from src/libjpeg-turbo/jni/wrppm.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wrppm.c
diff --git a/src/libjpeg-turbo/jni/wrrle.c b/libjpeg-turbo-android/libjpeg-turbo/jni/wrrle.c
similarity index 100%
rename from src/libjpeg-turbo/jni/wrrle.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wrrle.c
diff --git a/src/libjpeg-turbo/jni/wrtarga.c b/libjpeg-turbo-android/libjpeg-turbo/jni/wrtarga.c
similarity index 100%
rename from src/libjpeg-turbo/jni/wrtarga.c
rename to libjpeg-turbo-android/libjpeg-turbo/jni/wrtarga.c
diff --git a/src/libjpeg-turbo/libs/android-support-v4.jar b/libjpeg-turbo-android/libjpeg-turbo/libs/android-support-v4.jar
similarity index 100%
rename from src/libjpeg-turbo/libs/android-support-v4.jar
rename to libjpeg-turbo-android/libjpeg-turbo/libs/android-support-v4.jar
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/cjpeg b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/cjpeg
new file mode 100755
index 0000000..515b25b
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/cjpeg differ
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/djpeg b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/djpeg
new file mode 100755
index 0000000..8feaa3b
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/djpeg differ
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/jpegtran b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/jpegtran
new file mode 100755
index 0000000..46d7079
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/jpegtran differ
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/libjpegpi.so b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/libjpegpi.so
new file mode 100755
index 0000000..c915ac1
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/libjpegpi.so differ
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/rdjpgcom b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/rdjpgcom
new file mode 100755
index 0000000..588630b
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/rdjpgcom differ
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/tjbench b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/tjbench
new file mode 100755
index 0000000..db865ba
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/tjbench differ
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/tjunittest b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/tjunittest
new file mode 100755
index 0000000..a804929
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/tjunittest differ
diff --git a/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/wrjpgcom b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/wrjpgcom
new file mode 100755
index 0000000..597867c
Binary files /dev/null and b/libjpeg-turbo-android/libjpeg-turbo/libs/armeabi/wrjpgcom differ
diff --git a/src/libjpeg-turbo/proguard-project.txt b/libjpeg-turbo-android/libjpeg-turbo/proguard-project.txt
similarity index 100%
rename from src/libjpeg-turbo/proguard-project.txt
rename to libjpeg-turbo-android/libjpeg-turbo/proguard-project.txt
diff --git a/src/libjpeg-turbo/project.properties b/libjpeg-turbo-android/libjpeg-turbo/project.properties
similarity index 100%
rename from src/libjpeg-turbo/project.properties
rename to libjpeg-turbo-android/libjpeg-turbo/project.properties
diff --git a/src/libjpeg-turbo/res/drawable-hdpi/ic_launcher.png b/libjpeg-turbo-android/libjpeg-turbo/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from src/libjpeg-turbo/res/drawable-hdpi/ic_launcher.png
rename to libjpeg-turbo-android/libjpeg-turbo/res/drawable-hdpi/ic_launcher.png
diff --git a/src/libjpeg-turbo/res/drawable-ldpi/ic_launcher.png b/libjpeg-turbo-android/libjpeg-turbo/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from src/libjpeg-turbo/res/drawable-ldpi/ic_launcher.png
rename to libjpeg-turbo-android/libjpeg-turbo/res/drawable-ldpi/ic_launcher.png
diff --git a/src/libjpeg-turbo/res/drawable-mdpi/ic_launcher.png b/libjpeg-turbo-android/libjpeg-turbo/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from src/libjpeg-turbo/res/drawable-mdpi/ic_launcher.png
rename to libjpeg-turbo-android/libjpeg-turbo/res/drawable-mdpi/ic_launcher.png
diff --git a/src/libjpeg-turbo/res/drawable-xhdpi/ic_launcher.png b/libjpeg-turbo-android/libjpeg-turbo/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from src/libjpeg-turbo/res/drawable-xhdpi/ic_launcher.png
rename to libjpeg-turbo-android/libjpeg-turbo/res/drawable-xhdpi/ic_launcher.png
diff --git a/src/libjpeg-turbo/res/layout/activity_main.xml b/libjpeg-turbo-android/libjpeg-turbo/res/layout/activity_main.xml
similarity index 100%
rename from src/libjpeg-turbo/res/layout/activity_main.xml
rename to libjpeg-turbo-android/libjpeg-turbo/res/layout/activity_main.xml
diff --git a/src/libjpeg-turbo/res/menu/activity_main.xml b/libjpeg-turbo-android/libjpeg-turbo/res/menu/activity_main.xml
similarity index 100%
rename from src/libjpeg-turbo/res/menu/activity_main.xml
rename to libjpeg-turbo-android/libjpeg-turbo/res/menu/activity_main.xml
diff --git a/src/libjpeg-turbo/res/values-v11/styles.xml b/libjpeg-turbo-android/libjpeg-turbo/res/values-v11/styles.xml
similarity index 100%
rename from src/libjpeg-turbo/res/values-v11/styles.xml
rename to libjpeg-turbo-android/libjpeg-turbo/res/values-v11/styles.xml
diff --git a/src/libjpeg-turbo/res/values-v14/styles.xml b/libjpeg-turbo-android/libjpeg-turbo/res/values-v14/styles.xml
similarity index 100%
rename from src/libjpeg-turbo/res/values-v14/styles.xml
rename to libjpeg-turbo-android/libjpeg-turbo/res/values-v14/styles.xml
diff --git a/src/libjpeg-turbo/res/values/strings.xml b/libjpeg-turbo-android/libjpeg-turbo/res/values/strings.xml
similarity index 100%
rename from src/libjpeg-turbo/res/values/strings.xml
rename to libjpeg-turbo-android/libjpeg-turbo/res/values/strings.xml
diff --git a/src/libjpeg-turbo/res/values/styles.xml b/libjpeg-turbo-android/libjpeg-turbo/res/values/styles.xml
similarity index 100%
rename from src/libjpeg-turbo/res/values/styles.xml
rename to libjpeg-turbo-android/libjpeg-turbo/res/values/styles.xml
diff --git a/src/libjpeg-turbo/src/com/example/libjpeg/turbo/MainActivity.java b/libjpeg-turbo-android/libjpeg-turbo/src/com/example/libjpeg/turbo/MainActivity.java
similarity index 100%
rename from src/libjpeg-turbo/src/com/example/libjpeg/turbo/MainActivity.java
rename to libjpeg-turbo-android/libjpeg-turbo/src/com/example/libjpeg/turbo/MainActivity.java
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/.project b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/.project
new file mode 100644
index 0000000..3b470bc
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>use-libjpeg-trubo-adnroid</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/AndroidManifest.xml b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/AndroidManifest.xml
new file mode 100644
index 0000000..9b6e1ff
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.testlibjpeg"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk
+        android:minSdkVersion="8"
+        android:targetSdkVersion="21" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+    </application>
+
+</manifest>
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/bin/jarlist.cache b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/bin/jarlist.cache
new file mode 100644
index 0000000..0565465
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/bin/jarlist.cache
@@ -0,0 +1,3 @@
+# cache for current jar dependency. DO NOT EDIT.
+# format is <lastModified> <length> <SHA-1> <path>
+# Encoding is UTF-8
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/gen/com/example/testlibjpeg/BuildConfig.java b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/gen/com/example/testlibjpeg/BuildConfig.java
new file mode 100644
index 0000000..bb3eedf
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/gen/com/example/testlibjpeg/BuildConfig.java
@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.example.testlibjpeg;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}
\ No newline at end of file
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/gen/com/example/testlibjpeg/R.java b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/gen/com/example/testlibjpeg/R.java
new file mode 100644
index 0000000..989e2c1
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/gen/com/example/testlibjpeg/R.java
@@ -0,0 +1,47 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.example.testlibjpeg;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int ic_launcher=0x7f020000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f030000;
+    }
+    public static final class style {
+        /** 
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    
+
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        
+
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    
+ API 11 theme customizations can go here. 
+
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    
+ API 14 theme customizations can go here. 
+         */
+        public static final int AppBaseTheme=0x7f040000;
+        /**  Application theme. 
+ All customizations that are NOT specific to a particular API-level can go here. 
+         */
+        public static final int AppTheme=0x7f040001;
+    }
+}
diff --git a/Android.mk b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/Android.mk
similarity index 83%
rename from Android.mk
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/Android.mk
index 0ab754b..86efa81 100644
--- a/Android.mk
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/Android.mk
@@ -22,20 +22,20 @@ LOCAL_SRC_FILES := libjpegpi.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 #crypt
-include $(CLEAR_VARS)
-LOCAL_MODULE    := piutil
-LOCAL_SRC_FILES := crypt.c
-LOCAL_LDLIBS := -lcrypto
-LOCAL_C_INCLUDES := $(LOCAL_PATH) \
+#include $(CLEAR_VARS)
+#LOCAL_MODULE    := piutil
+#LOCAL_SRC_FILES := crypt.c
+#LOCAL_LDLIBS := -lcrypto
+#LOCAL_C_INCLUDES := $(LOCAL_PATH) \
 					$(LOCAL_PATH)/crypto
-include $(BUILD_SHARED_LIBRARY)
+#include $(BUILD_SHARED_LIBRARY)
 
 
 #
 include $(CLEAR_VARS)
 LOCAL_MODULE    := pijni
 LOCAL_SRC_FILES := pilibjni.c
-LOCAL_SHARED_LIBRARIES := libjpegpi piutil
+LOCAL_SHARED_LIBRARIES := libjpegpi 
 LOCAL_LDLIBS := -ljnigraphics -llog  
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/libjpeg-turbo \
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/LICENSE b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/LICENSE
new file mode 100644
index 0000000..ad410e1
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/LICENSE
@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/README.md b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/README.md
new file mode 100644
index 0000000..79fd4b1
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/README.md
@@ -0,0 +1,41 @@
+Buid libjpeg-turbo-android-lib
+==================
+
+1.To get started, ensure you have the latest NDK
+You must configure the path of JDK and Android SDK.
+
+    echo "export ANDROID_HOME='Your android ndk path'" >> ~/.bash_profile
+
+    source ~/.bash_profile
+
+
+2.Build libjpeg-turbo.so
+
+    cd ../libjpeg-turbo-android/libjpeg-turbo/jni
+
+    ndk-buld
+
+3.You can get libjpegpi.so in 
+
+     ../libjpeg-turbo-android/libjpeg-turbo/libs/armeabi
+
+
+4.Copy libjpegpi.so to ../bither-android-lib/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni
+
+     cd ../bither-android-lib/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni
+
+     ndk-build
+
+5.You can get libjpegpi.so and libpijni.so 
+
+
+6.Use libjpeg-turbo in java 
+
+     static {
+
+        System.loadLibrary("jpegpi");
+       
+        System.loadLibrary("pijni");
+
+     }
+ and you must use class of "com.pi.common.util.NativeUtil"
diff --git a/crypt.c b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypt.c
similarity index 100%
rename from crypt.c
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypt.c
diff --git a/crypto/openssl/aes.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/aes.h
similarity index 100%
rename from crypto/openssl/aes.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/aes.h
diff --git a/crypto/openssl/e_os2.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/e_os2.h
similarity index 100%
rename from crypto/openssl/e_os2.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/e_os2.h
diff --git a/crypto/openssl/opensslconf.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/opensslconf.h
similarity index 100%
rename from crypto/openssl/opensslconf.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/opensslconf.h
diff --git a/crypto/openssl/ossl_typ.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/ossl_typ.h
similarity index 100%
rename from crypto/openssl/ossl_typ.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/ossl_typ.h
diff --git a/crypto/openssl/rand.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/rand.h
similarity index 100%
rename from crypto/openssl/rand.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/crypto/openssl/rand.h
diff --git a/libcrypto.so b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libcrypto.so
similarity index 100%
rename from libcrypto.so
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libcrypto.so
diff --git a/src/libjpeg-turbo/jni/android/config.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/android/config.h
similarity index 100%
rename from src/libjpeg-turbo/jni/android/config.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/android/config.h
diff --git a/src/libjpeg-turbo/jni/android/jconfig.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/android/jconfig.h
similarity index 100%
rename from src/libjpeg-turbo/jni/android/jconfig.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/android/jconfig.h
diff --git a/src/libjpeg-turbo/jni/cderror.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/cderror.h
similarity index 100%
rename from src/libjpeg-turbo/jni/cderror.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/cderror.h
diff --git a/src/libjpeg-turbo/jni/cdjpeg.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/cdjpeg.h
similarity index 100%
rename from src/libjpeg-turbo/jni/cdjpeg.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/cdjpeg.h
diff --git a/src/libjpeg-turbo/jni/jconfig.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jconfig.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jconfig.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jconfig.h
diff --git a/src/libjpeg-turbo/jni/jerror.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jerror.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jerror.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jerror.h
diff --git a/src/libjpeg-turbo/jni/jinclude.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jinclude.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jinclude.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jinclude.h
diff --git a/src/libjpeg-turbo/jni/jmorecfg.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jmorecfg.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jmorecfg.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jmorecfg.h
diff --git a/src/libjpeg-turbo/jni/jpeglib.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jpeglib.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jpeglib.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jpeglib.h
diff --git a/src/libjpeg-turbo/jni/jversion.h b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jversion.h
similarity index 100%
rename from src/libjpeg-turbo/jni/jversion.h
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpeg-turbo/jversion.h
diff --git a/libjpegpi.so b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpegpi.so
similarity index 100%
rename from libjpegpi.so
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/libjpegpi.so
diff --git a/pilibjni.c b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/pilibjni.c
similarity index 83%
rename from pilibjni.c
rename to libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/pilibjni.c
index 861443f..0d717cc 100644
--- a/pilibjni.c
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/jni/pilibjni.c
@@ -22,8 +22,8 @@
 
 typedef uint8_t BYTE;
 
-extern int encrypt(char * input, int input_len, char * output, int * en_len);
-extern int decrypt(char * input, int en_len, char * output, int * de_len);
+//extern int encrypt(char * input, int input_len, char * output, int * en_len);
+//extern int decrypt(char * input, int en_len, char * output, int * de_len);
 char *error;
 struct my_error_mgr {
   struct jpeg_error_mgr pub;
@@ -190,37 +190,37 @@ jstring Java_com_pi_common_util_NativeUtil_compressBitmap(JNIEnv* env,
 	}
 	return (*env)->NewStringUTF(env, "1"); //success
 }
-jbyteArray Java_com_pi_common_util_NativeUtil_decrypt(JNIEnv* env,
-		jobject thiz, jbyteArray fileNameStr) {
-
-	jsize alen = (*env)->GetArrayLength(env, fileNameStr);
-	char * sourceChar = jstrinTostring(env, fileNameStr);
-	char result[alen];
-	int result_len;
-	int ret;
-	ret = decrypt(sourceChar, alen, result, &result_len);
-	if (ret) {
-		return (*env)->NewStringUTF(env, "");
-	} else {
-		return stoJstring(env, result,result_len);
-	}
-
-}
-jbyteArray Java_com_pi_common_util_NativeUtil_encrypt(JNIEnv* env,
-		jobject thiz, jbyteArray fileNameStr) {
-	jsize alen = (*env)->GetArrayLength(env, fileNameStr);
-	char * sourceChar = jstrinTostring(env, fileNameStr);
-	char result[alen + 64];
-	int result_len;
-	int ret;
-	ret = encrypt(sourceChar, alen, result, &result_len);
-	if (ret) {
-		return (*env)->NewStringUTF(env, "");
-	} else {
-		return stoJstring(env, result,result_len);
-	}
-
-}
+//jbyteArray Java_com_pi_common_util_NativeUtil_decrypt(JNIEnv* env,
+//		jobject thiz, jbyteArray fileNameStr) {
+//
+//	jsize alen = (*env)->GetArrayLength(env, fileNameStr);
+//	char * sourceChar = jstrinTostring(env, fileNameStr);
+//	char result[alen];
+//	int result_len;
+//	int ret;
+//	ret = decrypt(sourceChar, alen, result, &result_len);
+//	if (ret) {
+//		return (*env)->NewStringUTF(env, "");
+//	} else {
+//		return stoJstring(env, result,result_len);
+//	}
+//
+//}
+//jbyteArray Java_com_pi_common_util_NativeUtil_encrypt(JNIEnv* env,
+//		jobject thiz, jbyteArray fileNameStr) {
+//	jsize alen = (*env)->GetArrayLength(env, fileNameStr);
+//	char * sourceChar = jstrinTostring(env, fileNameStr);
+//	char result[alen + 64];
+//	int result_len;
+//	int ret;
+//	ret = encrypt(sourceChar, alen, result, &result_len);
+//	if (ret) {
+//		return (*env)->NewStringUTF(env, "");
+//	} else {
+//		return stoJstring(env, result,result_len);
+//	}
+//
+//}
 
 void jstringTostring(JNIEnv* env, jstring jstr, char * output, int * de_len) {
 	*output = NULL;
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/android-support-v4.jar b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/android-support-v4.jar
new file mode 100644
index 0000000..c31cede
Binary files /dev/null and b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/android-support-v4.jar differ
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/armeabi/libjpegpi.so b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/armeabi/libjpegpi.so
new file mode 100755
index 0000000..7d43e53
Binary files /dev/null and b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/armeabi/libjpegpi.so differ
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/armeabi/libpijni.so b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/armeabi/libpijni.so
new file mode 100755
index 0000000..b5e38fb
Binary files /dev/null and b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/libs/armeabi/libpijni.so differ
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/proguard-project.txt b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/project.properties b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/project.properties
new file mode 100644
index 0000000..3409f08
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/project.properties
@@ -0,0 +1,14 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-20
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-hdpi/ic_launcher.png b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..96a442e
Binary files /dev/null and b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-hdpi/ic_launcher.png differ
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-mdpi/ic_launcher.png b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..359047d
Binary files /dev/null and b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-mdpi/ic_launcher.png differ
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-xhdpi/ic_launcher.png b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..71c6d76
Binary files /dev/null and b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values-v11/styles.xml b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values-v11/styles.xml
new file mode 100644
index 0000000..3c02242
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values-v11/styles.xml
@@ -0,0 +1,11 @@
+<resources>
+
+    <!--
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
+        <!-- API 11 theme customizations can go here. -->
+    </style>
+
+</resources>
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values-v14/styles.xml b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values-v14/styles.xml
new file mode 100644
index 0000000..a91fd03
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values-v14/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+        <!-- API 14 theme customizations can go here. -->
+    </style>
+
+</resources>
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values/strings.xml b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values/strings.xml
new file mode 100644
index 0000000..b43f4f2
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values/strings.xml
@@ -0,0 +1,5 @@
+<resources>
+
+    <string name="app_name">testLibjpeg</string>
+
+</resources>
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values/styles.xml b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values/styles.xml
new file mode 100644
index 0000000..6ce89c7
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/res/values/styles.xml
@@ -0,0 +1,20 @@
+<resources>
+
+    <!--
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Light">
+        <!--
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        -->
+    </style>
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="AppBaseTheme">
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+    </style>
+
+</resources>
diff --git a/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/src/com/pi/common/util/NativeUtil.java b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/src/com/pi/common/util/NativeUtil.java
new file mode 100644
index 0000000..21cb6ad
--- /dev/null
+++ b/libjpeg-turbo-android/use-libjpeg-trubo-adnroid/src/com/pi/common/util/NativeUtil.java
@@ -0,0 +1,80 @@
+package com.pi.common.util;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.util.Log;
+
+public class NativeUtil {
+	public static void compressBitmap(Bitmap bit, int quality, String fileName,
+			boolean optimize) {
+
+		// boolean checkSdk16 = ((StringUtil.compareString(Build.DEVICE,
+		// "bbk77_cu_jb")
+		// || StringUtil.compareString(Build.DEVICE, "bird77_a_twn_jb")
+		// || StringUtil.compareString(Build.DEVICE, "n821") || StringUtil
+		// .compareString(Build.DEVICE, "hwG520-5000")) && Build.VERSION.SDK_INT
+		// == 16);
+		// if (checkSdk16) {
+		// try {
+		// File file = new File(fileName);
+		// bit.compress(CompressFormat.JPEG, 70,
+		// new FileOutputStream(file));
+		// LogUtil.d("native", "compress of bitmap");
+		// } catch (FileNotFoundException e) {
+		// e.printStackTrace();
+		// }
+		// return;
+		// }
+
+		Log.d("native", "compress of native");
+		if (bit.getConfig() != Config.ARGB_8888) {
+			Bitmap result = null;
+
+			result = Bitmap.createBitmap(bit.getWidth(), bit.getHeight(),
+					Config.ARGB_8888);
+			Canvas canvas = new Canvas(result);
+			Rect rect = new Rect(0, 0, bit.getWidth(), bit.getHeight());
+			canvas.drawBitmap(bit, null, rect, null);
+			saveBitmap(result, quality, fileName, optimize);
+			result.recycle();
+		} else {
+			saveBitmap(bit, quality, fileName, optimize);
+		}
+
+	}
+
+	private static void saveBitmap(Bitmap bit, int quality, String fileName,
+			boolean optimize) {
+		compressBitmap(bit, bit.getWidth(), bit.getHeight(), quality,
+				fileName.getBytes(), optimize);
+
+	}
+
+	public static boolean isInteger(Object obj) {
+		try {
+			Integer.parseInt(obj.toString());
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	private static native String compressBitmap(Bitmap bit, int w, int h,
+			int quality, byte[] fileNameBytes, boolean optimize);
+
+	static {
+		System.loadLibrary("jpegpi");
+		System.loadLibrary("pijni");
+
+	}
+
+}
diff --git a/src/libjpeg-turbo/.classpath b/src/libjpeg-turbo/.classpath
deleted file mode 100644
index a4763d1..0000000
--- a/src/libjpeg-turbo/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/src/libjpeg-turbo/libs/armeabi/cjpeg b/src/libjpeg-turbo/libs/armeabi/cjpeg
deleted file mode 100644
index d35b9c6..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/cjpeg and /dev/null differ
diff --git a/src/libjpeg-turbo/libs/armeabi/djpeg b/src/libjpeg-turbo/libs/armeabi/djpeg
deleted file mode 100644
index dec7bcf..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/djpeg and /dev/null differ
diff --git a/src/libjpeg-turbo/libs/armeabi/jpegtran b/src/libjpeg-turbo/libs/armeabi/jpegtran
deleted file mode 100644
index cc7bcfd..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/jpegtran and /dev/null differ
diff --git a/src/libjpeg-turbo/libs/armeabi/libjpeg.so b/src/libjpeg-turbo/libs/armeabi/libjpeg.so
deleted file mode 100644
index 84381a9..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/libjpeg.so and /dev/null differ
diff --git a/src/libjpeg-turbo/libs/armeabi/rdjpgcom b/src/libjpeg-turbo/libs/armeabi/rdjpgcom
deleted file mode 100644
index 25802e6..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/rdjpgcom and /dev/null differ
diff --git a/src/libjpeg-turbo/libs/armeabi/tjbench b/src/libjpeg-turbo/libs/armeabi/tjbench
deleted file mode 100644
index 40ebfbf..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/tjbench and /dev/null differ
diff --git a/src/libjpeg-turbo/libs/armeabi/tjunittest b/src/libjpeg-turbo/libs/armeabi/tjunittest
deleted file mode 100644
index 250d249..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/tjunittest and /dev/null differ
diff --git a/src/libjpeg-turbo/libs/armeabi/wrjpgcom b/src/libjpeg-turbo/libs/armeabi/wrjpgcom
deleted file mode 100644
index 4e1ce46..0000000
Binary files a/src/libjpeg-turbo/libs/armeabi/wrjpgcom and /dev/null differ