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

gameplay/src/PlatformAndroid.cpp

@@ -45,8 +45,8 @@ PFNGLISVERTEXARRAYOESPROC glIsVertexArray = NULL;
 namespace gameplay
 {
 
-// Gets the Keyboard::Key enumeration constant that corresponds to the given QNX key code.
-Keyboard::Key getKey(int keycode, int metastate)
+// Gets the Keyboard::Key enumeration constant that corresponds to the given Android key code.
+extern Keyboard::Key getKey(int keycode, int metastate)
 {
     bool shiftOn = (metastate == AMETA_SHIFT_ON);
     

gameplay/src/gameplay-main-android.cpp

@@ -17,7 +17,12 @@ extern ASensorManager* __sensorManager;
 extern const ASensor* __accelerometerSensor;
 extern ASensorEventQueue* __sensorEventQueue;
 extern ASensorEvent __sensorEvent;
+
+namespace gameplay
+{
 extern Keyboard::Key getKey(int keycode, int metastate);
+}
+
 bool __initialized;
 
 /**