summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberto96 <albertoguanti@gmail.com>2015-11-12 22:51:16 +0100
committerAndreas Schneider <asn@cryptomilk.org>2016-01-04 08:43:16 +0100
commit49c495aa5cc7caec3f980c4e11e97a05148de1d4 (patch)
tree2f3758ceeda1cbc3a5ebe2ad25e8c837bf7be36f
parent2da14966a9800569a7cb830c045f7c21849e7bdd (diff)
downloadandroid_hardware_samsung_slsi_exynos5430-49c495aa5cc7caec3f980c4e11e97a05148de1d4.tar.gz
android_hardware_samsung_slsi_exynos5430-49c495aa5cc7caec3f980c4e11e97a05148de1d4.tar.xz
android_hardware_samsung_slsi_exynos5430-49c495aa5cc7caec3f980c4e11e97a05148de1d4.zip
mobicore: Remove dependency on deprecated stlport sources
Change-Id: I137258e4061b1b200f848ede272fd3fecb41438d
-rw-r--r--mobicore/Android.mk3
-rw-r--r--mobicore/common/LogWrapper/log.h1
-rw-r--r--mobicore/rootpa/Code/Android/app/jni/CommonPAWrapper/JniHelpers.cpp1
3 files changed, 3 insertions, 2 deletions
diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index 4152d7f..dd3c7ba 100644
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -12,14 +12,13 @@ COMP_PATH_MobiCoreDriverMod := $(MOBICORE_PROJECT_PATH)/include
# Application wide Cflags
GLOBAL_INCLUDES := bionic \
- external/stlport/stlport \
$(COMP_PATH_MobiCore)/inc \
$(COMP_PATH_MobiCoreDriverMod)/Public \
$(COMP_PATH_MobiCore)/inc/TlCm \
$(COMP_PATH_MobiCore)/inc/GP \
$(MOBICORE_PROJECT_PATH)/common/DrSecureStorage
-GLOBAL_LIBRARIES := libstlport
+LOCAL_CXX_STL := libstlport
# Include the Daemon
include $(MOBICORE_PROJECT_PATH)/daemon/Android.mk
diff --git a/mobicore/common/LogWrapper/log.h b/mobicore/common/LogWrapper/log.h
index f296449..4b8b5e8 100644
--- a/mobicore/common/LogWrapper/log.h
+++ b/mobicore/common/LogWrapper/log.h
@@ -47,6 +47,7 @@
#ifndef WIN32
#include <android/log.h>
#endif
+#include <string.h>
/** LOG_I(fmt, args...)
* Informative logging, only shown in debug version
diff --git a/mobicore/rootpa/Code/Android/app/jni/CommonPAWrapper/JniHelpers.cpp b/mobicore/rootpa/Code/Android/app/jni/CommonPAWrapper/JniHelpers.cpp
index e47653d..f6ebfbf 100644
--- a/mobicore/rootpa/Code/Android/app/jni/CommonPAWrapper/JniHelpers.cpp
+++ b/mobicore/rootpa/Code/Android/app/jni/CommonPAWrapper/JniHelpers.cpp
@@ -33,6 +33,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
#include "JniHelpers.h"
#include "rootpaErrors.h"
+#include <string.h>
JniHelpers::JniHelpers(JNIEnv* envP):broken_(false),
envP_(envP),