diff options
| author |  Jake Voytko <jake@reviewninja.com> | 2016-01-08 09:58:29 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2016-01-08 14:58:58 +0000 |
| commit | 2cdfbd595c251e6e99454cfeeab5407911442506 (patch) | |
| tree | e9561fe1dff58661493b035531523e1f045b659e /src | |
| parent | ca858831e73146375588ddb72a6adbd273f49603 (diff) | |
Adds the Android design support library as an Android dependency.
This library is a default dependency of some template projects used by Android
Studio.
--
Change-Id: I732939b81ccc9bc5756ae6ffa594f87efd459dbb
Reviewed-on: https://bazel-review.googlesource.com/#/c/2611
MOS_MIGRATED_REVID=111677018
Diffstat (limited to 'src')
3 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java index f336a41e1d..3b6accc10e 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/AndroidSdkRepositoryRule.java @@ -54,6 +54,7 @@ public class AndroidSdkRepositoryRule implements RuleDefinition { "android/appcompat_v4", Label.parseAbsoluteUnchecked(prefix + "appcompat_v4")); builder.put( "android/appcompat_v7", Label.parseAbsoluteUnchecked(prefix + "appcompat_v7")); + builder.put("android/design", Label.parseAbsoluteUnchecked(prefix + "design")); builder.put( "android/mediarouter_v7", Label.parseAbsoluteUnchecked(prefix + "mediarouter_v7")); builder.put("android/cardview_v7", Label.parseAbsoluteUnchecked(prefix + "cardview_v7")); diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE index eb45c9cbd6..916e59d944 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android.WORKSPACE @@ -15,3 +15,4 @@ bind(name = "android/sdk") bind(name = "android/crosstool", actual = "@bazel_tools//tools/cpp:toolchain") bind(name = "android/appcompat_v4") bind(name = "android/appcompat_v7") +bind(name = "android/design") diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt index eb1ebc459c..22f5477bb5 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt @@ -19,6 +19,19 @@ android_library( ) java_import( + name = "design_import", + jars = ["extras/android/support/design/libs/android-support-design.jar"], +) + +android_library( + name = "design", + custom_package = "android.support.design", + manifest = "extras/android/support/design/AndroidManifest.xml", + resource_files = glob(["extras/android/support/design/res/**"]), + deps = [":design_import", ":appcompat_v7"] +) + +java_import( name = "mediarouter_v7_import", jars = ["extras/android/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar"] ) |