Set 'jvmDataModel.arg' property in crosscompile build scripts, where 'gluegen.cpptasks.detected.os' is set.

3 files changed, 2 insertions, 7 deletions

diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh
index b294bed..9f54348 100755
--- a/make/scripts/make.gluegen.all.android-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh
@@ -114,6 +114,7 @@ ant \
     -DisUnix=true \
     -DisAndroid=true \
     -DisAndroidARMv7=true \
+    -DjvmDataModel.arg="-Djnlp.no.jvm.data.model.set=true" \
     -DisCrosscompilation=true \
     \
     $* 2>&1 | tee -a make.gluegen.all.android-armv7-cross.log
diff --git a/make/scripts/make.gluegen.all.linux-armv7-cross.sh b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
index 0ad8151..3d44f35 100755
--- a/make/scripts/make.gluegen.all.linux-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7-cross.sh
@@ -35,11 +35,8 @@ ant \
     -DisLinux=true \
     -DisLinuxARMv7=true \
     -DisX11=true \
+    -DjvmDataModel.arg="-Djnlp.no.jvm.data.model.set=true" \
     -DisCrosscompilation=true \
-    \
-    -DuseKD=true \
-    -DuseOpenMAX=true \
-    -DuseBroadcomEGL=true \
     $* 2>&1 | tee make.gluegen.all.linux-armv7-cross.log
 
 
diff --git a/make/scripts/make.gluegen.all.linux-armv7.sh b/make/scripts/make.gluegen.all.linux-armv7.sh
index 2221c10..ecc2d77 100755
--- a/make/scripts/make.gluegen.all.linux-armv7.sh
+++ b/make/scripts/make.gluegen.all.linux-armv7.sh
@@ -12,7 +12,4 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm
 
 ant \
     -Drootrel.build=build-linux-armv7 \
-    -DuseKD=true \
-    -DuseOpenMAX=true \
-    -DuseBroadcomEGL=true \
     $* 2>&1 | tee make.gluegen.all.linux-armv7.log