diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-07-28 13:20:32 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2014-08-03 22:42:19 +0200 |
| commit | 7f36e996a07ed7f39a33fffb2d2c523adf00eefc (patch) | |
| tree | d955a770622459e5c0acc89b96dc37b597f1a0f3 | |
| parent | c77f452d83f4f01bb0b91c19773ca9715d1aae2a (diff) | |
build avmedia for Android
Change-Id: I0137bb7ce6337ca852af513565cc19dad3c8dc8b
| -rw-r--r-- | configure.ac | 3 | ||||
| -rwxr-xr-x | 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 = [ |