From c6ba090a0030c177d7e60f797a3ec25fecfe3546 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 25 Dec 2019 02:09:03 +0100
Subject: Bug 1417 - Android: Disable native FFmpeg binding for Android

---
 make/build-common.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'make/build-common.xml')

diff --git a/make/build-common.xml b/make/build-common.xml
index 567219434..b6bf47fc5 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -2,7 +2,9 @@
 
 <!--
    - Some environment defs affecting native compilation
-       setup.addNativeDRMGBM  ( always true if 'isLinux' )
+       setup.addNativeDRMGBM  ( true if 'isLinux' )
+
+       setup.addNativeFFmpeg  ( true if not 'isAndroid' )
 -->
 <project name="JOGLCommonStuff" basedir="." default="common.init">
 
@@ -120,10 +122,17 @@
             <isset property="isLinux"/>
         </condition>
 
+        <condition property="setup.addNativeFFmpeg">
+            <not>
+                <istrue value="${isAndroid}" />
+            </not>
+        </condition>
+
         <echo message="setup.noAWT: ${setup.noAWT}" />
         <echo message="setup.noNativeAWT: ${setup.noNativeAWT}" />
         <echo message="setup.noNativeDesktop: ${setup.noNativeDesktop}" />
         <echo message="setup.addNativeDRMGBM: ${setup.addNativeDRMGBM}" />
+        <echo message="setup.addNativeFFmpeg: ${setup.addNativeFFmpeg}" />
 
         <!-- Load the user specified properties file that defines various host
            - specific paths.  The user will be notified if this is does not
-- 
cgit v1.2.3