Pulling Axel's gradle changes.

Author: chadrockey

build.xml

@@ -28,15 +28,6 @@
          -->
     <property file="ant.properties" />
 
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
     <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
 
@@ -50,7 +41,7 @@
 
     <!-- quick check on sdk.dir -->
     <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
             unless="sdk.dir"
     />
 

buildAll.sh

@@ -7,5 +7,5 @@ if [ $? -eq 0 ]
   adb install bin/MainActivity-debug.apk
   adb shell am start -n org.ros.android.android_sensors_driver/org.ros.android.android_sensors_driver.MainActivity
   adb logcat -c
-  adb logcat | grep CICCIO
+  adb logcat
 fi

local.properties

@@ -7,4 +7,4 @@
 # location of the SDK. This is only used by Ant
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/home/furlan/android-sdks
+sdk.dir=/home/willow/NVPACK/android-sdk-linux

project.properties

@@ -8,7 +8,7 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:15
+target=android-13
 #android.library=true
 android.library.reference.1=../android_gingerbread_mr1
 android.library.reference.2=../../OpenCV-2.4.2-android-sdk/sdk/java

src/org/ros/android/android_sensors_driver/MainActivity.java

@@ -180,9 +180,9 @@ protected void init(NodeMainExecutor nodeMainExecutor)
     NodeConfiguration nodeConfiguration4 = NodeConfiguration.newPublic(InetAddressFactory.newNonLoopback().getHostAddress());
     nodeConfiguration4.setMasterUri(getMasterUri());
 //    nodeConfiguration4.setMasterUri(URI.create("http://192.168.1.213:11311/")); //Hardcoding the Ros master IP for fast debug
-    nodeConfiguration4.setNodeName("android_sensors_driver_camera");
-    this.cam_pub = new CameraPublisher(this);
-    nodeMainExecutor.execute(this.cam_pub, nodeConfiguration4);
+//    nodeConfiguration4.setNodeName("android_sensors_driver_camera");
+//    this.cam_pub = new CameraPublisher(this);
+//    nodeMainExecutor.execute(this.cam_pub, nodeConfiguration4);
 
   }
 }