From 7f286e0965eb31f29c68b1c1e32d2653ae34014e Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Date: Fri, 18 Mar 2016 14:07:42 +0100
Subject: [PATCH] Remove the traces of the discontinued android-no-sdk platform
Change-Id: Ib9ba913543270e25e9c8deff492b98b0525c9219
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
---
src/plugins/android/android.pro | 2 +-
src/plugins/android/src/qandroidmediaserviceplugin.cpp | 2 --
src/plugins/opensles/qopenslesengine.cpp | 6 +++---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index fa322942b..e77053b77 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -1,7 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += src
-android:!android-no-sdk: SUBDIRS += jar
+android: SUBDIRS += jar
qtHaveModule(quick) {
SUBDIRS += videonode
diff --git a/src/plugins/android/src/qandroidmediaserviceplugin.cpp b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
index 693789054..87de7d561 100644
--- a/src/plugins/android/src/qandroidmediaserviceplugin.cpp
+++ b/src/plugins/android/src/qandroidmediaserviceplugin.cpp
@@ -148,7 +148,6 @@ int QAndroidMediaServicePlugin::cameraOrientation(const QByteArray &device) cons
QT_END_NAMESPACE
-#ifndef Q_OS_ANDROID_NO_SDK
Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
{
QT_USE_NAMESPACE
@@ -176,4 +175,3 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*reserved*/)
return JNI_VERSION_1_4;
}
-#endif // Q_OS_ANDROID_NO_SDK
diff --git a/src/plugins/opensles/qopenslesengine.cpp b/src/plugins/opensles/qopenslesengine.cpp
index 8a08c46f3..0cbd10887 100644
--- a/src/plugins/opensles/qopenslesengine.cpp
+++ b/src/plugins/opensles/qopenslesengine.cpp
@@ -143,7 +143,7 @@ QList<int> QOpenSLESEngine::supportedSampleRates(QAudio::Mode mode) const
int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defaultValue)
{
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+#if defined(Q_OS_ANDROID)
static int sampleRate = 0;
static int framesPerBuffer = 0;
static const int sdkVersion = QtAndroidPrivate::androidSdkVersion();
@@ -204,7 +204,7 @@ int QOpenSLESEngine::getOutputValue(QOpenSLESEngine::OutputValue type, int defau
int QOpenSLESEngine::getDefaultBufferSize(const QAudioFormat &format)
{
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+#if defined(Q_OS_ANDROID)
if (!format.isValid())
return 0;
@@ -252,7 +252,7 @@ int QOpenSLESEngine::getLowLatencyBufferSize(const QAudioFormat &format)
bool QOpenSLESEngine::supportsLowLatency()
{
-#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
+#if defined(Q_OS_ANDROID)
static int isSupported = -1;
if (isSupported != -1)
--
GitLab