From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 28 Oct 2013 20:04:51 +0000 (+0100)
Subject: Add android build check
X-Git-Tag: v0.3.4~10
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/orte.git/commitdiff_plain/dfa160ad763d428b7b698923c988a703bc721e4b

Add android build check
---

diff --git a/Makefile.git b/Makefile.git
index c0f9fe9..f4f69d7 100644
--- 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 c0ae87c..f850739 100644
--- 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