From 7f36e996a07ed7f39a33fffb2d2c523adf00eefc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= <tomaz.vajngerl@collabora.com>
Date: Mon, 28 Jul 2014 13:20:32 +0200
Subject: [PATCH] build avmedia for Android

Change-Id: I0137bb7ce6337ca852af513565cc19dad3c8dc8b
---
 configure.ac              | 3 +--
 solenv/bin/native-code.py | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index fc995634bb16..d9d930363dfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2446,10 +2446,9 @@ fi
 AC_SUBST(DISABLE_EXPORT)
 
 # Whether to build "avmedia" functionality or not.
-# We probably don't want it for non-desktop.
 
 if test -z "$enable_avmedia"; then
-    if test $_os != iOS -a $_os != Android; then
+    if test $_os != iOS; then
         enable_avmedia=yes
     fi
 fi
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 2e0f3b7a1d48..7236929e913d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -129,6 +129,7 @@ calc_factory_list = [
     ("libscdlo.a", "scd_component_getFactory"),
     ("libscfiltlo.a", "scfilt_component_getFactory"),
     ("libsclo.a", "sc_component_getFactory"),
+    ("libavmedialo.a", "avmedia_component_getFactory"),
     ]
 
 calc_constructor_list = [