Skip to content

Commit b39f51b

Browse files
committed
Change minimum Android SDK level to 27 (Android 8.1 Oreo)
1 parent d49c663 commit b39f51b

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

Build/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android-build:
2626
$(MAKE) CONFIGTYPE=$(CONFIGTYPE) \
2727
CMAKE_EXTRA+="-DCMAKE_TOOLCHAIN_FILE=$(ANDROID_NDK_HOME)/build/cmake/android.toolchain.cmake \
2828
-DANDROID_ABI=$(ANDROID_ABI) \
29-
-DANDROID_PLATFORM=android-21 \
29+
-DANDROID_PLATFORM=android-27 \
3030
-DBUILD_TEAMTALK_LIBRARY_LIB=ON \
3131
-DBUILD_TEAMTALK_LIBRARY_LIBPRO=ON \
3232
-DBUILD_TEAMTALK_LIBRARIES=ON \

Client/TeamTalkAndroid/build.gradle

+9-9
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ android {
2929

3030
defaultConfig {
3131
applicationId "dk.bearware.gui"
32-
minSdkVersion 21
32+
minSdkVersion 27
3333
targetSdkVersion 34
3434
versionCode 134
3535
versionName '5.16'
@@ -42,14 +42,14 @@ android {
4242
}
4343
}
4444

45-
splits {
46-
abi {
47-
enable true
48-
reset()
49-
include "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
50-
universalApk true
51-
}
52-
}
45+
splits {
46+
abi {
47+
enable true
48+
reset()
49+
include "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
50+
universalApk true
51+
}
52+
}
5353

5454
buildTypes {
5555
release {

Library/TeamTalkLib/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Building for Android platform is supported on Ubuntu 22.
7474
following in TEAMTALK_ROOT:
7575
* `sudo make -C Build depend-ubuntu22`
7676
* `sudo` is required because `apt install` is called.
77-
* Download [Android NDK r21e](https://developer.android.com/ndk) and
77+
* Download [Android NDK r27c](https://developer.android.com/ndk) and
7878
unzip it. Make environment variable `ANDROID_NDK_HOME` point to the
7979
unzipped location.
8080

Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Android")
492492
CONFIGURE_COMMAND ${FFMPEG_EXPORT} && <SOURCE_DIR>/configure ${FFMPEG_CFG} --prefix=<INSTALL_DIR>
493493
# External libraries:
494494
--disable-indev=v4l2
495+
--disable-indev=android_camera
495496
--disable-vulkan
496497
# Programs/docs
497498
--disable-doc

0 commit comments

Comments
 (0)