From 1ef3ef6a30e6cb38e332da6cc62aea18248e9eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@digia.com>
Date: Thu, 15 May 2014 13:57:34 +0200
Subject: [PATCH] Make it possible to build multimedia for embedded Android

Change-Id: I3400b18379242ea4d1b4f94f5da6b60c64d551e4
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
---
 qtmultimedia.pro                | 2 +-
 src/plugins/android/android.pro | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 1deaab2a..c7f093cc 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -12,7 +12,7 @@ win32 {
     qtCompileTest(evr)
 } else:mac {
     qtCompileTest(avfoundation)
-} else:android {
+} else:android:!android-no-sdk {
     SDK_ROOT = $$(ANDROID_SDK_ROOT)
     isEmpty(SDK_ROOT): SDK_ROOT = $$DEFAULT_ANDROID_SDK_ROOT
     !exists($$SDK_ROOT/platforms/android-11/android.jar): error("QtMultimedia for Android requires API level 11")
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index 807f8ece..fa322942 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
-SUBDIRS += src \
-           jar
+SUBDIRS += src
+android:!android-no-sdk: SUBDIRS += jar
 
 qtHaveModule(quick) {
     SUBDIRS += videonode