From: Marcus Comstedt <redacted>
Date: Wed, 7 Dec 2016 20:07:57 +0000 (+0100)
Subject: sigrok-cross-android: Force Java 1.6 when building the bindings
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f2c71fc6b6e7f4d27c8085aa4fe0db85c436b7f9;p=sigrok-util.git

sigrok-cross-android: Force Java 1.6 when building the bindings
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index ea67d6b..4e1214f 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -372,7 +372,7 @@ cd libsigrok
 ./autogen.sh
 mkdir build
 cd build
-CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
+CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" JAVAC="javac -source 1.6 -target 1.6" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
 make $PARALLEL $V
 make datadir='$(datarootdir)' install $V
 cd ../..