Merge branch 'next' of https://github.com/blackberry/GamePlay into next

build.xml

@@ -0,0 +1,66 @@
+<!--
+  - Overall Android native build script (for convenience)
+  -
+  - If new GamePlay samples are added please keep this list
+  - in sync.
+ -->
+<project name="GamePlay-Android" default="all" basedir=".">
+
+  <fail message="OS not supported (must be Windows, MacOS X, or Linux)">
+    <condition>
+      <not>
+        <or>
+          <os family="unix"/> <!-- includes MacOS X -->
+          <os family="windows"/>
+        </or>
+      </not>
+    </condition>
+  </fail>
+
+  <macrodef name="build-native">
+    <attribute name="location"/>
+    <sequential>
+
+      <!-- Non-Windows execs -->
+      <exec osfamily="unix" dir="@{location}/android" executable="android">
+        <arg value="update"/>
+        <arg value="project"/>
+        <arg value="-t"/>
+        <arg value="1"/>
+        <arg value="-p"/>
+        <arg value="."/>
+        <arg value="-s"/>
+      </exec>
+      <exec osfamily="unix" dir="@{location}/android" executable="ndk-build"/>
+
+      <!-- Windows execs -->
+      <exec osfamily="windows" dir="@{location}/android" executable="cmd">
+        <arg value="/c"/>
+        <arg value="android.bat"/>
+        <arg value="update"/>
+        <arg value="project"/>
+        <arg value="-t"/>
+        <arg value="1"/>
+        <arg value="-p"/>
+        <arg value="."/>
+        <arg value="-s"/>
+      </exec>
+      <exec osfamily="windows" dir="@{location}/android" executable="cmd">
+        <arg value="/c"/>
+        <arg value="ndk-build"/>
+      </exec>
+
+    </sequential>
+  </macrodef>
+
+  <target name="all">
+    <build-native location="gameplay"/>
+    <build-native location="samples/browser"/>
+    <build-native location="samples/character"/>
+    <build-native location="samples/lua"/>
+    <build-native location="samples/mesh"/>
+    <build-native location="samples/particles"/>
+    <build-native location="samples/racer"/>
+    <build-native location="samples/spaceship"/>
+  </target>
+</project>

gameplay/src/Control.h

@@ -1122,7 +1122,7 @@ protected:
      * hovered, disabled, etc), this method is called to allow implementations to update
      * internal data related to control state.
      *
-     * @param The new control state.
+     * @param state The new control state.
      */
     virtual void updateState(State state);