The version parsing code was hard coding the fact that the
desired version is of the form
r + NUMERIC_MAJOR_VERSION + ALPHABETIC_MINOR_VERSION
r10 release of the NDK does not have a minor version an it breaks
the logic.
The fix is to make the version extraction be more robust to the
optional presence of the minor version.
Change-Id: Iace13ae7cad8cbd93ed635ecf7f1dce3a3ae15d5
The script assert_ndk_version.sh used to require that the user
either define ANDROID_NDK_ROOT or ndk-build be in the path
so that ANDROID_NDK_ROOT can be inferred.
But since we are always calling this script from within an
Android.mk file, ndk-build already defines a variable called
NDK_ROOT, which we can pass to the script, thereby simplifying it
and making it more robust.
Change-Id: I31d66529a36a93e760e0dd0f17cfe61428fbac55
- Ceres now requires Android NDK version >= r9d to compile, Jørgen's
script allows a clean way to verify this condition is met before
trying to compile for Android.
- Note that this is a modified version of the original script, which
adds support for versions >= 10, and fixes extraction of the version
number now that the architecture is also included.
Change-Id: Icd7ffd25407bcf29af007e30b5da5d18eb799adf
Sameer Agarwal