summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2016-01-04 09:46:05 +0100
committerAndreas Schneider <asn@cryptomilk.org>2016-01-04 09:46:05 +0100
commit36d52545973f9706205dc32f4b921ab9ad77df0b (patch)
tree6708ecf45b30ba774c7336a5d9832cc462804d88
parenta077e107ee69a21f77bb667d57654e59b395dca0 (diff)
downloadandroid_hardware_samsung_slsi_exynos5430-36d52545973f9706205dc32f4b921ab9ad77df0b.tar.gz
android_hardware_samsung_slsi_exynos5430-36d52545973f9706205dc32f4b921ab9ad77df0b.tar.xz
android_hardware_samsung_slsi_exynos5430-36d52545973f9706205dc32f4b921ab9ad77df0b.zip
Revert "mobicore: Remove dependency on deprecated stlport sources"
This reverts commit 49c495aa5cc7caec3f980c4e11e97a05148de1d4.
-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, 2 insertions, 3 deletions
diff --git a/mobicore/Android.mk b/mobicore/Android.mk
index dd3c7ba..4152d7f 100644
--- a/mobicore/Android.mk
+++ b/mobicore/Android.mk
@@ -12,13 +12,14 @@ 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
-LOCAL_CXX_STL := libstlport
+GLOBAL_LIBRARIES := 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 7d904f5..3fdca18 100644
--- a/mobicore/common/LogWrapper/log.h
+++ b/mobicore/common/LogWrapper/log.h
@@ -47,7 +47,6 @@
#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 f6ebfbf..e47653d 100644
--- a/mobicore/rootpa/Code/Android/app/jni/CommonPAWrapper/JniHelpers.cpp
+++ b/mobicore/rootpa/Code/Android/app/jni/CommonPAWrapper/JniHelpers.cpp
@@ -33,7 +33,6 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
#include "JniHelpers.h"
#include "rootpaErrors.h"
-#include <string.h>
JniHelpers::JniHelpers(JNIEnv* envP):broken_(false),
envP_(envP),