summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android/Bootstrap/Makefile.shared2
-rw-r--r--configure.ac8
-rw-r--r--external/liborcus/UnpackedTarball_liborcus.mk8
-rw-r--r--external/liborcus/android-workaround.patch22
-rw-r--r--include/android/compatibility.hxx6
-rw-r--r--solenv/gbuild/platform/android.mk11
6 files changed, 1 insertions, 56 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared
index 2e1c8c163bd2..f77679853d39 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -59,7 +59,7 @@ WHOLELIBS = \
$(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS)
@echo "Linking $@"
mkdir -p $(OBJLOCAL)
- $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lgnustl_static,-lc++_static -lc++abi -landroid_support) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
+ $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lc++_static -lc++abi -landroid_support $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz
$(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so
mkdir -p $(SODEST)
diff --git a/configure.ac b/configure.ac
index faaed1bbe8b9..6687a8d54ff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,22 +486,14 @@ if test -n "$with_android_ndk"; then
ANDROIDCFLAGS="$ANDROIDCFLAGS -D__ANDROID_API__=$ANDROID_API_LEVEL -isystem $ANDROID_NDK_HOME/sysroot/usr/include"
ANDROIDCFLAGS="$ANDROIDCFLAGS -isystem $ANDROID_NDK_HOME/sysroot/usr/include/$android_gnu_prefix"
ANDROIDCFLAGS="$ANDROIDCFLAGS --sysroot=$SYSBASE -ffunction-sections -fdata-sections -Qunused-arguments"
- if test "$ANDROID_APP_ABI" = "armeabi-v7a"; then
- ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ANDROID_APP_ABI -D_GTHREAD_USE_MUTEX_INIT_FUNC=1"
- else
ANDROIDCFLAGS="$ANDROIDCFLAGS -L$ANDROID_NDK_HOME/sources/cxx-stl/llvm-libc++/libs/$ANDROID_APP_ABI"
- fi
if test "$ENABLE_LTO" = TRUE; then
# -flto comes from com_GCC_defs.mk, too, but we need to make sure it gets passed as part of
# $CC and $CXX when building external libraries
ANDROIDCFLAGS="$ANDROIDCFLAGS -flto -fuse-linker-plugin -O2"
fi
- if test "$ANDROID_APP_ABI" = "armeabi-v7a"; then
- ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/4.9/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/4.9/libs/$ANDROID_APP_ABI/include -std=c++11"
- else
ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I$ANDROID_NDK_HOME/sources/cxx-stl/llvm-libc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/llvm-libc++abi/include -I$ANDROID_NDK_HOME/sources/android/support/include -std=c++11"
- fi
if test -z "$CC"; then
CC="$ANDROID_COMPILER_BIN/clang $ANDROIDCFLAGS"
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk
index aa831e3aa7db..a21401011bde 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -27,12 +27,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
))
endif
-# TODO: remove once switching arm to llvm-c++
-ifeq ($(ANDROID_APP_ABI),armeabi-v7a)
-$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
- external/liborcus/android-workaround.patch \
-))
-endif
-
-
# vim: set noet sw=4 ts=4:
diff --git a/external/liborcus/android-workaround.patch b/external/liborcus/android-workaround.patch
deleted file mode 100644
index f9d047dc0559..000000000000
--- a/external/liborcus/android-workaround.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/parser/sax_parser_base.cpp b/src/parser/sax_parser_base.cpp
-index 743130d..2624bd5 100644
---- a/src/parser/sax_parser_base.cpp
-+++ b/src/parser/sax_parser_base.cpp
-@@ -12,6 +12,17 @@
- #include <vector>
- #include <memory>
-
-+#ifdef __ANDROID__
-+namespace std
-+{
-+int stoi(const std::string& str, std::size_t* /*pos*/ = 0, int base = 10)
-+{
-+ char* end;
-+ return strtol(str.c_str(), &end, base);
-+}
-+}
-+#endif
-+
- namespace orcus { namespace sax {
-
- malformed_xml_error::malformed_xml_error(const std::string& msg, std::ptrdiff_t offset) :
diff --git a/include/android/compatibility.hxx b/include/android/compatibility.hxx
index 27c99f4f2604..1dc403dc0fe8 100644
--- a/include/android/compatibility.hxx
+++ b/include/android/compatibility.hxx
@@ -27,12 +27,6 @@ namespace std
{
inline double fmax(double x, double y) { return ::fmax(x, y); }
-inline long stol(const std::string& str, std::size_t* /*pos*/ = 0, int base = 10)
-{
- char* end;
- return strtol(str.c_str(), &end, base);
-}
-
template <typename T> T round(T x) { return ::round(x); }
template <typename T> T trunc(T x) { return ::trunc(x); }
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index bc8ad996f8df..572a7c5b1028 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -9,25 +9,14 @@
ifeq ($(DISABLE_DYNLOADING),TRUE)
-ifeq ($(ANDROID_APP_ABI),armeabi-v7a)
-# TODO: gnustl is deprecated/will be removed in future versions of the ndk
-gb_STDLIBS := -lgnustl_static
-else
gb_STDLIBS := \
-lc++_static \
-lc++abi \
-landroid_support \
-endif
-
else
-ifeq ($(ANDROID_APP_ABI),armeabi-v7a)
-# TODO: gnustl is deprecated/will be removed in future versions of the ndk
-gb_STDLIBS := -lgnustl_shared
-else
gb_STDLIBS := -lc++_shared
-endif
endif