[IOT-1089] Change Android build system to accomodate both Android and Generic Java...

[contrib/iotivity.git] / auto_build.sh

diff --git a/auto_build.sh b/auto_build.sh
index aa2dcd4..ab79ffa 100755 (executable)
--- a/auto_build.sh
+++ b/auto_build.sh
@@ -15,6 +15,8 @@ function build_all()
                build_linux_unsecured_with_rm $1 $2
                build_linux_unsecured_with_rd $1 $2
                build_linux_secured_with_rd $1 $2
+               build_linux_unsecured_with_java $1 $2
+               build_linux_secured_with_java $1 $2
                build_simulator $1 $2
        fi
 
@@ -80,6 +82,18 @@ function build_linux_secured_with_rd()
        scons RELEASE=$1 WITH_RD=1 SECURED=1 $2
 }
 
+function build_linux_unsecured_with_java()
+{
+       echo "*********** Build for linux With Resource Directory & Security ************"
+       scons RELEASE=$1 BUILD_JAVA=ON TARGET_TRANSPORT=IP $2
+}
+
+function build_linux_secured_with_java()
+{
+       echo "*********** Build for linux With Resource Directory & Security ************"
+       scons RELEASE=$1 SECURED=1 BUILD_JAVA=ON TARGET_TRANSPORT=IP $2
+}
+
 function build_android()
 {
        # Note: for android, as oic-resource uses C++11 feature stoi and to_string,
@@ -247,6 +261,14 @@ then
        then
                build_linux_secured_with_rd true
                build_linux_secured_with_rd false
+       elif [ $1 = 'linux_unsecured_with_java' ]
+       then
+               build_linux_unsecured_with_java true
+               build_linux_unsecured_with_java false
+       elif [ $1 = 'linux_secured_with_java' ]
+       then
+               build_linux_secured_with_java true
+               build_linux_secured_with_java false
        elif [ $1 = 'android' ]
        then
                build_android true