aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/BUILD
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2016-10-06 20:21:56 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-10-07 08:08:04 +0000
commit4f005551b52083f1e8995f799d4dc8a690604d95 (patch)
treedd015311f1d71cefa7b7dbd2fe52fbfd2927fb2b /third_party/BUILD
parent69d9b417534aae71728c5f6bcc67fe44bb4e4241 (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 'third_party/BUILD')
-rw-r--r--third_party/BUILD30
1 files changed, 13 insertions, 17 deletions
diff --git a/third_party/BUILD b/third_party/BUILD
index 2e5f9c761f..5f0ee4d6ec 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -69,24 +69,20 @@ java_import(
)
java_import(
- name = "android_sdklib",
+ name = "android_common_25_0_0",
jars = [
- "android_common/com.android.tools_sdklib_23.1.3.jar",
- ],
-)
-
-java_import(
- name = "android_common",
- jars = [
- "android_common/com.android.tools.build_builder_0.13.3.jar",
- "android_common/com.android.tools.build_builder-model_0.13.3.jar",
- "android_common/com.android.tools.build_manifest-merger_23.1.3.jar",
- "android_common/com.android.tools_common_23.1.3.jar",
- "android_common/com.android.tools_sdk-common_23.1.3.jar",
- "android_common/com.android.tools.layoutlib_layoutlib_23.1.3.jar",
- ],
- exports = [
- ":android_sdklib",
+ "android_common/com.android_annotations_25.0.0.jar",
+ "android_common/com.android.tools.build_builder_2.0.0.jar",
+ "android_common/com.android.tools.build_builder-model_2.0.0.jar",
+ "android_common/com.android.tools.build_builder-test-api_2.0.0.jar",
+ "android_common/com.android.tools.build_manifest-merger_25.0.0.jar",
+ "android_common/com.android.tools_common_25.0.0.jar",
+ "android_common/com.android.tools_ddmlib_25.0.0.jar",
+ "android_common/com.android.tools_dvlib_25.0.0.jar",
+ "android_common/com.android.tools_repository_25.0.0.jar",
+ "android_common/com.android.tools_sdk-common_25.0.0.jar",
+ "android_common/com.android.tools_sdklib_25.0.0.jar",
+ "android_common/com.android.tools.layoutlib_layoutlib_25.0.0.jar",
],
)