Temporarily rename JNI's package.cpp wrapper

To ease debugging with conflicting file names between that and SDK's package.cpp
readium · Dec 10, 2014 · 7d2b0df · 7d2b0df · danielweck · Jan 6, 2015
1 parent e78d78a
commit 7d2b0df
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/Platform/Android/Android.mk b/Platform/Android/Android.mk
@@ -306,7 +306,7 @@ LOCAL_SRC_FILES := \
 		Platform/Android/jni/jni/jni_ptr.cpp \
 		Platform/Android/jni/epub3.cpp \
 		Platform/Android/jni/container.cpp \
-		Platform/Android/jni/package.cpp \
+		Platform/Android/jni/packagejni.cpp \
 		Platform/Android/jni/iri.cpp \
 		Platform/Android/jni/resource_stream.cpp
 

diff --git a/Platform/Android/Application.mk b/Platform/Android/Application.mk
@@ -1,4 +1,5 @@
 APP_ABI := armeabi-v7a
 APP_PLATFORM := android-19
 NDK_TOOLCHAIN_VERSION := 4.9
-APP_STL := gnustl_static
+APP_STL := gnustl_static
+APP_OPTIM := debug
diff --git a/Platform/Android/jni/container.cpp b/Platform/Android/jni/container.cpp
@@ -29,7 +29,7 @@
 #include "epub3.h"
 #include "helpers.h"
 #include "container.h"
-#include "package.h"
+#include "packagejni.h"
 
 
 using namespace std;

diff --git a/Platform/Android/jni/epub3.cpp b/Platform/Android/jni/epub3.cpp
@@ -33,7 +33,7 @@
 #include "epub3.h"
 #include "helpers.h"
 #include "container.h"
-#include "package.h"
+#include "packagejni.h"
 #include "iri.h"
 #include "resource_stream.h"
 

diff --git a/Platform/Android/jni/package.cpp → Platform/Android/jni/packagejni.cpp b/Platform/Android/jni/package.cpp → Platform/Android/jni/packagejni.cpp
diff --git a/Platform/Android/jni/package.h → Platform/Android/jni/packagejni.h b/Platform/Android/jni/package.h → Platform/Android/jni/packagejni.h