diff options
| -rw-r--r-- | tools/android/packaging/xbmc/AndroidManifest.xml.in | 8 | ||||
| -rw-r--r-- | tools/depends/configure.ac | 16 | ||||
| -rw-r--r-- | tools/depends/target/Makefile | 4 | ||||
| -rw-r--r-- | tools/depends/target/libnfs/Makefile | 2 |
4 files changed, 20 insertions, 10 deletions
diff --git a/tools/android/packaging/xbmc/AndroidManifest.xml.in b/tools/android/packaging/xbmc/AndroidManifest.xml.in index 882e0ae332..778adffafe 100644 --- a/tools/android/packaging/xbmc/AndroidManifest.xml.in +++ b/tools/android/packaging/xbmc/AndroidManifest.xml.in @@ -55,6 +55,7 @@ android:configChanges="orientation|keyboard|keyboardHidden|navigation|touchscreen|screenLayout|screenSize|colorMode" android:finishOnTaskLaunch="true" android:launchMode="singleInstance" + android:exported="true" android:screenOrientation="sensorLandscape" android:theme="@style/AppTheme"> <intent-filter> @@ -100,6 +101,7 @@ android:finishOnTaskLaunch="true" android:label="@string/app_name" android:launchMode="singleInstance" + android:exported="true" android:screenOrientation="sensorLandscape" android:theme="@style/AppTheme"> @@ -109,7 +111,8 @@ android:value="@APP_NAME_LC@" /> </activity> - <receiver android:name=".XBMCBroadcastReceiver"> + <receiver android:name=".XBMCBroadcastReceiver" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.DREAMING_STOPPED" /> <action android:name="android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED" /> @@ -132,7 +135,8 @@ android:authorities="@APP_PACKAGE@.ytdl" android:exported="true" /> - <activity android:name=".XBMCSearchableActivity" > + <activity android:name=".XBMCSearchableActivity" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.SEARCH" /> diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index dbe41742c1..6f2aed07d1 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -469,13 +469,19 @@ XBMC_SETUP_ARCH_DEFINES() case $build in *darwin*) - # MacOS 11 requires explicit isysroot for autoconf link tests - # However we do not want to pollute LDFLAGS once lib link tests are complete - LDFLAGS="$platform_includes" - AC_CHECK_LIB([z], [main], has_zlib=1, AC_MSG_WARN("No zlib support in toolchain. Will build libz."); has_zlib=0) + if test "$platform_os" != "android"; then + # MacOS 11 requires explicit isysroot for autoconf link tests + # However we do not want to pollute LDFLAGS once lib link tests are complete + LDFLAGS="$platform_includes" + AC_CHECK_LIB([z], [main], has_zlib=1, AC_MSG_WARN("No zlib support in toolchain. Will build libz."); has_zlib=0) + fi esac -AC_SEARCH_LIBS([iconv_open],iconv, link_iconv=$ac_cv_search_iconv_open, link_iconv=-liconv; AC_MSG_WARN("No iconv support in toolchain. Will build libiconv."); need_libiconv=1) +if test "$platform_os" == "android"; then + need_libiconv=1 +else + AC_SEARCH_LIBS([iconv_open],iconv, link_iconv=$ac_cv_search_iconv_open, link_iconv=-liconv; AC_MSG_WARN("No iconv support in toolchain. Will build libiconv."); need_libiconv=1) +fi case $build in *darwin*) diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 82c02508dc..d615deccc4 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -66,7 +66,7 @@ else endif ifeq ($(OS),darwin_embedded) - EXCLUDED_DEPENDS = libcec libusb + EXCLUDED_DEPENDS = libcec libusb googletest ifeq ($(TARGET_PLATFORM),appletvos) DEPENDS += boblight EXCLUDED_DEPENDS += libshairplay libplist @@ -82,7 +82,7 @@ ifeq ($(OS),osx) endif ifeq ($(OS),android) - EXCLUDED_DEPENDS = libcec libusb + EXCLUDED_DEPENDS = libcec libusb googletest DEPENDS += dummy-libxbmc libuuid libandroidjni libzip PYMODULE_DEPS = dummy-libxbmc LIBUUID = libuuid diff --git a/tools/depends/target/libnfs/Makefile b/tools/depends/target/libnfs/Makefile index 53408de352..a66461e157 100644 --- a/tools/depends/target/libnfs/Makefile +++ b/tools/depends/target/libnfs/Makefile @@ -9,7 +9,7 @@ COMMITDATE=2020-06-09 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz # configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --disable-shared --disable-utils --disable-examples +CONFIGURE=./configure --prefix=$(PREFIX) --disable-shared --disable-utils --disable-examples --disable-werror LIBDYLIB=$(PLATFORM)/lib/.libs/$(LIBNAME).a |