diff options
| author |  Googler <noreply@google.com> | 2016-10-06 20:21:56 +0000 |
|---|---|---|
| committer |  Damien Martin-Guillerez <dmarting@google.com> | 2016-10-07 08:08:04 +0000 |
| commit | 4f005551b52083f1e8995f799d4dc8a690604d95 (patch) | |
| tree | dd015311f1d71cefa7b7dbd2fe52fbfd2927fb2b /src/main/java/com/google/devtools/build | |
| parent | 69d9b417534aae71728c5f6bcc67fe44bb4e4241 (diff) | |
Update android_ide_common to 25.0.0 and clean up FolderConfigs
Older android_ide_common does not handle BCP 47,
so we update the code to handle that and remove
most of the workarounds. This also pulls in a
fix for 3-letter locales, unblocks resource
shrinking whitelisting, etc.
--
MOS_MIGRATED_REVID=135396457
Diffstat (limited to 'src/main/java/com/google/devtools/build')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/BUILD | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index d2f503ae24..e754f9f073 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -898,7 +898,7 @@ java_library( "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:android_deploy_info_java_proto", "//src/main/protobuf:apk_manifest_java_proto", - "//third_party:android_sdklib", + "//third_party:android_common_25_0_0", "//third_party:auto_value", "//third_party:guava", "//third_party:jsr305", diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java index fc957f38f5..228a51818c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java @@ -13,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.rules.android; -import com.android.sdklib.repository.FullRevision; +import com.android.repository.Revision; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; @@ -52,18 +52,18 @@ public class AndroidSdk implements RuleConfiguredTargetFactory { String buildToolsVersion = AggregatingAttributeMapper.of(ruleContext.getRule()) .get("build_tools_version", Type.STRING); - FullRevision parsedBuildToolsVersion = null; + Revision parsedBuildToolsVersion = null; try { parsedBuildToolsVersion = Strings.isNullOrEmpty(buildToolsVersion) ? null - : FullRevision.parseRevision(buildToolsVersion); + : Revision.parseRevision(buildToolsVersion); } catch (NumberFormatException nfe) { ruleContext.attributeError("build_tools_version", "Invalid version: " + buildToolsVersion); } boolean aaptSupportsMainDexGeneration = parsedBuildToolsVersion == null - || parsedBuildToolsVersion.compareTo(new FullRevision(24)) >= 0; + || parsedBuildToolsVersion.compareTo(new Revision(24)) >= 0; FilesToRunProvider aidl = ruleContext.getExecutablePrerequisite("aidl", Mode.HOST); FilesToRunProvider aapt = ruleContext.getExecutablePrerequisite("aapt", Mode.HOST); FilesToRunProvider apkBuilder = ruleContext.getExecutablePrerequisite( |