diff options
author | Alex Humesky <ahumesky@google.com> | 2016-04-07 21:27:52 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2016-04-08 14:34:43 +0000 |
commit | d985242f8b2048de1ecbbe716aafd055c66068e2 (patch) | |
tree | aa133e29bd8cff23cc13b352fd50b70564d47993 /src/tools/android/java/com/google/devtools/build/android/Converters.java | |
parent | b1237366dd867c4c1060279d16f94a3c125cf6ba (diff) |
Adds a small temporary hack to the Android resource processor so that it doesn't
error on a build tools version ending in "-preview", because the current version
of the android_common libraries that bazel uses are slightly old and it will
take some time to upgrade to the latest version, which know how to parse the new
revision format.
--
MOS_MIGRATED_REVID=119308647
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/Converters.java')
-rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/Converters.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/Converters.java b/src/tools/android/java/com/google/devtools/build/android/Converters.java index dcd83a537d..fa3d56519f 100644 --- a/src/tools/android/java/com/google/devtools/build/android/Converters.java +++ b/src/tools/android/java/com/google/devtools/build/android/Converters.java @@ -98,6 +98,12 @@ public final class Converters { @Override public FullRevision convert(String input) throws OptionsParsingException { try { + // TODO(bazel-team): The current version of FullRevision doesn't know + // how to properly parse build tool revisions with "-preview", and + // upgrading to the lastest version will take time. Since we don't + // currently need to distinguish between preview and non-preview build + // tools, for now just remove the suffix. + input = input.replace("-preview", ""); return FullRevision.parseRevision(input); } catch (NumberFormatException e) { throw new OptionsParsingException(e.getMessage()); |