Merge pull request #1067 from blackberry/master

Merge master to next

gameplay/src/Animation.cpp

@@ -254,7 +254,7 @@ void Animation::createClips(Properties* animationProperties, unsigned int frameC
         int begin = pClip->getInt("begin");
         int end = pClip->getInt("end");
 
-        AnimationClip* clip = createClip(pClip->getId(), ((float)begin / (frameCount-1)) * _duration, ((float)end / (frameCount-1)) * _duration);
+        AnimationClip* clip = createClip(pClip->getId(), ((float)begin / frameCount) * _duration, ((float)end / frameCount) * _duration);
 
         const char* repeat = pClip->getString("repeatCount");
         if (repeat)

gameplay/src/Curve.cpp

@@ -1229,7 +1229,7 @@ int Curve::determineIndex(float time, unsigned int min, unsigned int max) const
     {
         mid = (min + max) >> 1;
 
-        if (time >= _points[mid].time && time <= _points[mid + 1].time)
+        if (time >= _points[mid].time && time < _points[mid + 1].time)
             return mid;
         else if (time < _points[mid].time)
             max = mid - 1;
@@ -1237,8 +1237,7 @@ int Curve::determineIndex(float time, unsigned int min, unsigned int max) const
             min = mid + 1;
     } while (min <= max);
     
-    // We should never hit this!
-    return -1;
+    return max;
 }
 
 int Curve::getInterpolationType(const char* curveId)

template/android/jni/template.Android.mk

@@ -22,7 +22,7 @@ VORBIS_PATH := ../GAMEPLAY_PATH/external-deps/oggvorbis/lib/android/arm
 OPENAL_PATH := ../GAMEPLAY_PATH/external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := ../GAMEPLAY_PATH/gameplay/android/obj/local/armeabi
+LOCAL_PATH := ../GAMEPLAY_PATH/gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a