Add android build check

diff --git a/Makefile.git b/Makefile.git
index c0f9fe99f1a5f3f4f99f65fd1f1c5c439b90c2c4..f4f69d73354fe22143d12aecb7779d1c3ff5ea1d 100644 (file)
--- a/Makefile.git
+++ b/Makefile.git
@@ -19,7 +19,7 @@ CONFIGURE_FLAGS = --enable-orte-idl
 configure: git
 
 check: configure
-       $(MAKE) check-windows check-autotools check-java
+       $(MAKE) check-windows check-autotools check-java check-android
 
 check-%:
        rm -rf _$@
@@ -46,6 +46,13 @@ check-java.real:
        $(MAKE)
        false # Java is not compiled - either fix it or update README
 
+check-android:
+       android update project -p orte/libaorte
+       android update project -p orte/contrib/Robot_Demo
+       cd orte/libaorte && ndk-build
+       cd orte/contrib/Robot_Demo && ant debug
+       test -f orte/contrib/Robot_Demo/bin/RoboDruid-debug.apk
+
 dist:
        $(MAKE) VER=$(VER) dist-tarball dist-check
        @echo "Tarball stored as orte-$(VER).tar.gz"

diff --git a/README.android b/README.android
index c0ae87ce7a6dbd7923166e4fe45d63eebf0c211c..f850739f50cb0a7646219a91c851c9edb78a84c8 100644 (file)
--- a/README.android
+++ b/README.android
@@ -9,8 +9,8 @@ Then follow these steps to compile the app:
    <ndk-folder>:<sdk-folder>/tools
 2) go to <sdk-folder>/tools and execute "android"
 3) download "SDK Platform" for "API 15" - Android 4.0.3
-4) go to orte/libaorte and execute "android update project -p .", then
-   go to orte/contrib/Robot_Demo and do the same
+4) execute "android update project -p orte/libaorte" and
+           "android update project -p orte/contrib/Robot_Demo"
 5) go to orte/libaorte and execute "ndk-build" - this builds native
    code
 6) go to orte/contrib/Robot_Demo and execute "ant debug" - this will prepare