diff options
| author | Wouter van Oortmerssen <wvo@google.com> | 2015-03-09 14:04:30 -0700 |
|---|---|---|
| committer | Wouter van Oortmerssen <wvo@google.com> | 2015-03-09 14:04:30 -0700 |
| commit | 6ccdfff0af9d82841c536ef38036bfc34f2ca90d (patch) | |
| tree | 1edfde45481ad021c27e3179e16593d960861e87 /android | |
| parent | 71e97b712306980f95a86e6770b0dd18c9915593 (diff) | |
| download | flatbuffers-6ccdfff0af9d82841c536ef38036bfc34f2ca90d.tar.gz flatbuffers-6ccdfff0af9d82841c536ef38036bfc34f2ca90d.tar.bz2 flatbuffers-6ccdfff0af9d82841c536ef38036bfc34f2ca90d.zip | |
Android build script works with pre-releases present.
build_apk.sh assumed pre-releases would be sorted towards the end,
but instead they end up at the front (sort -n) causing the api
selection loop to halt early.
bug: 19213196
Change-Id: I210a18c16e81880229f154c4613f8b97d90ac9bd
tested: on Linux.
Diffstat (limited to 'android')
| -rwxr-xr-x | android/build_apk.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/android/build_apk.sh b/android/build_apk.sh index 94a7275f..4967ee6d 100755 --- a/android/build_apk.sh +++ b/android/build_apk.sh @@ -243,12 +243,8 @@ select_android_build_target() { android_build_target="android-${android_target}" break fi - else - # The API version is a letter - # Letters are sorted to the end by 'sort -n' - # so we're out of numbered platforms. Use this one. - android_build_target="android-${android_target}" - break + # else + # The API version is a letter, so skip it. fi done if [[ "${android_build_target}" == "" ]]; then |