diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tools/depends/target/Makefile | 8 | ||||
| -rw-r--r-- | tools/depends/target/crossguid/Makefile | 3 | ||||
| -rw-r--r-- | xbmc/utils/StringUtils.cpp | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index fd5ab126ff..7981e8dad2 100644 --- a/configure.ac +++ b/configure.ac @@ -1125,7 +1125,7 @@ int main() { )]) AC_LANG_POP([C++]) -if test "${target_platform}" = "target_linux" || test "${target_platform}" = "target_raspberry_pi"; then +if test "${target_platform}" = "target_linux" || test "${target_platform}" = "target_raspberry_pi" || test "${target_platform}" = "target_android"; then PKG_CHECK_MODULES([UUID], [uuid],, AC_MSG_ERROR(libuuid not found)) fi @@ -1141,9 +1141,6 @@ AC_LINK_IFELSE( [AC_MSG_ERROR(crossguid not found)]) LIBS="$SAVED_LIBS" AC_LANG_POP([C++]) -if test "${target_platform}" = "target_android"; then - CXXFLAGS="$CXXFLAGS -DGUID_ANDROID" -fi PKG_CHECK_MODULES([YAJL], [yajl >= 2], [INCLUDES="$INCLUDES $YAJL_CFLAGS"; LIBS="$LIBS $YAJL_LIBS"; YAJL_FOUND="true"], diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index a93747cdd7..ed17ca5834 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -35,7 +35,8 @@ ifeq ($(OS),osx) endif ifeq ($(OS),android) - DEPENDS += mdnsresponder android-sources-ics google-breakpad + DEPENDS += mdnsresponder android-sources-ics google-breakpad libuuid + CROSSGUID_DEPS = libuuid endif DEPENDS := $(filter-out $(EXCLUDED_DEPENDS),$(DEPENDS)) @@ -63,6 +64,7 @@ ifeq ($(OS),linux) endif DEPENDS += alsa-lib ALSA_LIB = alsa-lib + CROSSGUID_DEPS = libuuid endif .PHONY: $(DEPENDS) @@ -97,9 +99,7 @@ libsdl2: $(LINUX_SYSTEM_LIBS) libxslt: libgcrypt ffmpeg: $(ICONV) $(ZLIB) bzip2 libvorbis $(FFMPEG_DEPENDS) libcec: platform -ifeq ($(OS),linux) -crossguid: libuuid -endif +crossguid: $(CROSSGUID_DEPS) .installed-$(PLATFORM): $(DEPENDS) touch $@ diff --git a/tools/depends/target/crossguid/Makefile b/tools/depends/target/crossguid/Makefile index 1a40249e1c..487ab2a617 100644 --- a/tools/depends/target/crossguid/Makefile +++ b/tools/depends/target/crossguid/Makefile @@ -26,9 +26,6 @@ endif # define specifying the native GUID implementation to use GUID_PLATFORM_DEFINE=GUID_LIBUUID -ifeq ($(OS),android) - GUID_PLATFORM_DEFINE=GUID_ANDROID -endif ifeq ($(OS),osx) GUID_PLATFORM_DEFINE=GUID_CFUUID endif diff --git a/xbmc/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp index 34b23218ad..df7a85a631 100644 --- a/xbmc/utils/StringUtils.cpp +++ b/xbmc/utils/StringUtils.cpp @@ -1081,11 +1081,7 @@ void StringUtils::WordToDigits(std::string &word) std::string StringUtils::CreateUUID() { -#if !defined(TARGET_ANDROID) static GuidGenerator guidGenerator; -#else - static GuidGenerator guidGenerator(xbmc_jnienv()); -#endif auto guid = guidGenerator.newGuid(); std::stringstream strGuid; strGuid << guid; |