commit b7ae098e21e4a5f8496d8d064ed2f38d59509eeb
author Dees Troy <dees_troy@teamw.in> Tue Sep 10 20:47:35 2013 +0000
committer Dees Troy <dees_troy@teamw.in> Tue Sep 10 20:47:46 2013 +0000
tree 66a8623d9b950df4eb8c2d4ceff3d58f28406980
parent abaa9ca8f3d3b7fa9ec6454d0ff03f5351313993

Kang in older minzip for building in CM9 & CM7

CM7 and CM9 do not have libselinux needed in the newer minzip.

gui/Android.mk

diff --git a/gui/Android.mk b/gui/Android.mk
index 18decd0..db7769d 100644
--- a/gui/Android.mk
+++ b/gui/Android.mk
@@ -64,6 +64,9 @@
 ifneq ($(TW_NO_SCREEN_TIMEOUT),)
 	LOCAL_CFLAGS += -DTW_NO_SCREEN_TIMEOUT
 endif
+ifeq ($(HAVE_SELINUX), true)
+LOCAL_CFLAGS += -DHAVE_SELINUX
+endif
 
 LOCAL_C_INCLUDES += bionic external/stlport/stlport $(commands_recovery_local_path)/gui/devices/$(DEVICE_RESOLUTION)
 

gui/blanktimer.cpp

diff --git a/gui/blanktimer.cpp b/gui/blanktimer.cpp
index a513ff0..8333053 100644
--- a/gui/blanktimer.cpp
+++ b/gui/blanktimer.cpp
@@ -20,7 +20,6 @@
 #include "rapidxml.hpp"
 using namespace rapidxml;
 extern "C" {
-#include "../minzip/Zip.h"
 #include "../minuitwrp/minui.h"
 }
 #include <string>
@@ -37,9 +36,15 @@
 #include <sstream>
 #include "pages.hpp"
 #include "blanktimer.hpp"
+#include "objects.hpp"
 #include "../data.hpp"
 extern "C" {
 #include "../twcommon.h"
+#ifdef HAVE_SELINUX
+#include "../minzip/Zip.h"
+#else
+#include "../minzipold/Zip.h"
+#endif
 }
 #include "../twrp-functions.hpp"
 #include "../variables.h"

gui/gui.cpp

diff --git a/gui/gui.cpp b/gui/gui.cpp
index 6ee29d5..8329827 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -37,7 +37,11 @@
 {
 #include "../twcommon.h"
 #include "../minuitwrp/minui.h"
+#ifdef HAVE_SELINUX
 #include "../minzip/Zip.h"
+#else
+#include "../minzipold/Zip.h"
+#endif
 #include <pixelflinger/pixelflinger.h>
 }
 

gui/objects.hpp

diff --git a/gui/objects.hpp b/gui/objects.hpp
index 8f6f9bb..d37b43e 100644
--- a/gui/objects.hpp
+++ b/gui/objects.hpp
@@ -26,7 +26,11 @@
 #include <map>
 
 extern "C" {
+#ifdef HAVE_SELINUX
 #include "../minzip/Zip.h"
+#else
+#include "../minzipold/Zip.h"
+#endif
 }
 
 using namespace rapidxml;

gui/pages.hpp

diff --git a/gui/pages.hpp b/gui/pages.hpp
index c308c1a..a37cdb9 100644
--- a/gui/pages.hpp
+++ b/gui/pages.hpp
@@ -3,6 +3,12 @@
 #ifndef _PAGES_HEADER_HPP
 #define _PAGES_HEADER_HPP
 
+#ifdef HAVE_SELINUX
+#include "../minzip/Zip.h"
+#else
+#include "../minzipold/Zip.h"
+#endif
+
 typedef struct {
 	unsigned char red;
 	unsigned char green;

gui/resources.hpp

diff --git a/gui/resources.hpp b/gui/resources.hpp
index 4e05e41..339e03a 100644
--- a/gui/resources.hpp
+++ b/gui/resources.hpp
@@ -3,6 +3,12 @@
 #ifndef _RESOURCE_HEADER
 #define _RESOURCE_HEADER
 
+#ifdef HAVE_SELINUX
+#include "../minzip/Zip.h"
+#else
+#include "../minzipold/Zip.h"
+#endif
+
 // Base Objects
 class Resource
 {