Merge pull request #518 from arris69/Build_with_Android_NDK

maybe Fixes assimp/assimp#516

.travis.yml

@@ -31,16 +31,21 @@ install:
   - if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi
 
 script:
-  - if [ $ANDROID ]; then ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ; fi
-  - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -STATIC_BUILD=$TRAVIS_STATIC_BUILD
-  - make
-  - sudo make install
-  - sudo ldconfig
-  - cd test/unit
-  - ../../bin/unit
-  - cd ../regression
-  - chmod 755 run.py
-  - ./run.py
-  - echo "=========================================================="
-  - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)"
-  - cat ../results/run_regression_suite_failures.csv
+  - if [ $ANDROID ]; then 
+    ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ; 
+    elif [ $RESERVED ]; then
+    echo "Reserved condition" ;
+    else
+    cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -STATIC_BUILD=$TRAVIS_STATIC_BUILD ;
+    make ;
+    sudo make install ;
+    sudo ldconfig ;
+    cd test/unit ;
+    ../../bin/unit ;
+    cd ../regression ;
+    chmod 755 run.py ;
+    ./run.py ;
+    echo "==========================================================" ;
+    echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)" ;
+    cat ../results/run_regression_suite_failures.csv;
+    fi