aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar Jingwen Chen <jin@crypt.sg>2018-05-28 22:41:36 -0400
committerGravatar Jingwen Chen <jingwen@google.com>2018-05-31 13:25:00 -0400
commitab0132928467970d55426dd32580b03508b3b68a (patch)
treedf0480cd09668e2a4e58ce2258e8be71bc05670f /third_party
parent943673171e07c319e0d8d544667320a6761e5a30 (diff)
Update android_common's layoutlib to 26.1.2 to support fonts in Bazel
RELNOTES: For Android projects, Bazel now supports building fonts as resources. See https://developer.android.com/guide/topics/ui/look-and-feel/fonts-in-xml for more information on the feature. Change-Id: I1cb25828b04e98cacc19d3c7a2e23ea764b48e92
Diffstat (limited to 'third_party')
-rw-r--r--third_party/BUILD8
-rw-r--r--third_party/android_common/com.android.tools.layoutlib_layoutlib_25.0.0.jarbin88350 -> 0 bytes
-rw-r--r--third_party/android_common/com.android.tools.layoutlib_layoutlib_26.1.2.jarbin0 -> 93233 bytes
3 files changed, 7 insertions, 1 deletions
diff --git a/third_party/BUILD b/third_party/BUILD
index df03b52b76..9ca154ff1f 100644
--- a/third_party/BUILD
+++ b/third_party/BUILD
@@ -85,7 +85,13 @@ java_import(
"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.external.lombok_lombok-ast_0.2.3.jar",
- "android_common/com.android.tools.layoutlib_layoutlib_25.0.0.jar",
+ # layoutlib has been upgraded to 26.1.2 *just* for font resource support.
+ # We are unable to upgrade the other libraries yet due to internal
+ # constraints with Blaze. See
+ # https://github.com/bazelbuild/bazel/issues/4381
+ # TODO(bazel-team): Upgrade entire android_common suite to 26+ after
+ # resolving internal constraint.
+ "android_common/com.android.tools.layoutlib_layoutlib_26.1.2.jar",
"android_common/com.android.tools.lint_lint-api_25.0.0.jar",
"android_common/com.android.tools.lint_lint-checks_25.0.0.jar",
"android_common/com.android.tools_common_25.0.0.jar",
diff --git a/third_party/android_common/com.android.tools.layoutlib_layoutlib_25.0.0.jar b/third_party/android_common/com.android.tools.layoutlib_layoutlib_25.0.0.jar
deleted file mode 100644
index 91a5c89b98..0000000000
--- a/third_party/android_common/com.android.tools.layoutlib_layoutlib_25.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/third_party/android_common/com.android.tools.layoutlib_layoutlib_26.1.2.jar b/third_party/android_common/com.android.tools.layoutlib_layoutlib_26.1.2.jar
new file mode 100644
index 0000000000..3ab9d3cb37
--- /dev/null
+++ b/third_party/android_common/com.android.tools.layoutlib_layoutlib_26.1.2.jar
Binary files differ