From 53afe2a5795c90467b9902766dce1b17a2ef267e Mon Sep 17 00:00:00 2001
From: howard-rti <howard@rti.com>
Date: Thu, 14 Aug 2014 14:46:24 -0700
Subject: [PATCH 1/2] Added some needed steps to build.

---
 ShapesDemo/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ShapesDemo/README.md b/ShapesDemo/README.md
index 1b153f9..fcd1461 100644
--- a/ShapesDemo/README.md
+++ b/ShapesDemo/README.md
@@ -47,7 +47,9 @@ These instructions are for a Windows development host.
     1. Open Properties for the ShapesDemo project
     2. Select "Java Build Path", and in the "Libraries" tab, use "Add External JAR" to add "nddsjava.jar" from 
        $(NDDSHOME)/class/
-    3. Copy "libnddsjava.so", "libnddsc.so", and "libnddscore.so" from $(NDDSHOME)/lib/armv7aAndroid2.3gcc4.8jdk
+    3. In the "Java Build Path" -> "Order and Export" tab, check to select "nddsjava.jar".
+    4. In the same tab, select "nddsjava.jar" and use the buttons on the side and move it to the top.
+    5. Copy "libnddsjava.so", "libnddsc.so", and "libnddscore.so" from $(NDDSHOME)/lib/armv7aAndroid2.3gcc4.8jdk
        into the project directory libs/armeabi-v7a
 
 7. To generate the APK, with the ShapesDemo project selected in the Project Explorer, you will need to select "Run" from the "Run" menu.  

From bd64f5f5be260766a97122131903c06463a669ad Mon Sep 17 00:00:00 2001
From: howard-rti <howard@rti.com>
Date: Fri, 22 Aug 2014 10:26:54 -0700
Subject: [PATCH 2/2] Added info about Windows USB driver.

---
 ShapesDemo/README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ShapesDemo/README.md b/ShapesDemo/README.md
index fcd1461..c6b733a 100644
--- a/ShapesDemo/README.md
+++ b/ShapesDemo/README.md
@@ -61,8 +61,11 @@ These instructions are for a Windows development host.
    Please consult the Android eclipse SDK documentation for further information.
    
 
+   NOTE:  On Windows, you may need to install or update your USB driver for your specific device.
+          Please see: http://developer.android.com/tools/extras/oem-usb.html
 
 ## Getting Started
+------------------
 
 1. Installing `ShapesDemo.apk` on a real Android Device
     1. Attach your Device via USB
@@ -143,12 +146,15 @@ WiFi network (on the same subnet).
 4. In ShapesDemo.exe (on your computer), you MUST change the Liveliness Kind of your 
 shape publishers (datawriters) to `MANUAL_BY_TOPIC` for the Android subscriber to receive the data.
 
+
 5. Notes:
 ShapesDemo on Android is configured by default to publish/subscribe using `BEST_EFFORT_RELIABILITY` 
 and `MANUAL_BY_TOPIC` Liveliness kind.
 
+
 6. See Troubleshooting section below if you can't get the two ShapesDemos to exchange data.
     
+    
 File Description
 -----------------
 ### Java ###
@@ -168,8 +174,6 @@ File Description
 * `src/com/rti/android/shapesdemo/util/EditTextPreferenceWithValue.java` - Useful class so that when a preference (setting/option) is changed by the user, the new value is automatically reflected in the preferences menu.
  
  
-
- 
 ### Android Application Files ###
 
 * `AndroidManifest.xml` - Main definition file for ShapesDemo app including which Activity to start on startup
@@ -184,6 +188,7 @@ File Description
 
 
 ## Troubleshooting
+-------------------
   
 1. ShapesDemo can't publish or subscribe to host?