diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-13 03:04:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-13 03:04:25 +0000 |
commit | ca7f4e1cb7db2e3322bd09eb13bad9313411d55b (patch) | |
tree | cbb3546d5c6eb60c2856d199f348b73c8b223fc0 | |
parent | 49a4572303e4a218222f9fd70fc182b4e90d1f76 (diff) | |
parent | 4b40a09c583c4bd90e13b6eade9d80b85fe161da (diff) | |
download | Music-ca7f4e1cb7db2e3322bd09eb13bad9313411d55b.tar.gz |
Merge "Declare resources in a library under kotlin/ for Music app Bazel build."android-s-beta-5android-s-beta-5
-rw-r--r-- | BUILD | 2 | ||||
-rw-r--r-- | kotlin/BUILD | 31 |
2 files changed, 32 insertions, 1 deletions
@@ -5,5 +5,5 @@ android_binary( srcs = glob(["src/**/*.java"]), custom_package = "com.android.music", manifest = "AndroidManifest.xml", - resource_files = glob(["kotlin/res/**"]), + deps = ["//packages/apps/Music/kotlin:MusicResources"], ) diff --git a/kotlin/BUILD b/kotlin/BUILD new file mode 100644 index 0000000..ab0691c --- /dev/null +++ b/kotlin/BUILD @@ -0,0 +1,31 @@ +load("@rules_android//rules:rules.bzl", "android_binary", "android_library") + +# Placeholder manifest is required to build the android library below. +genrule( + name = "gen_placeholdermanifest", + outs = ["AndroidManifest.xml"], + cmd = """ +echo '<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="com.android.Music" + android:versionCode="1" + android:versionName="1.0" > + + <uses-sdk + android:minSdkVersion="21" + android:targetSdkVersion="21" /> +</manifest> + +' > $@""", +) + +# Workaround a bug where including resources at the top-level android_binary fails, +# it seems due to the resource folder being nested. Instead, we create this +# library to hold the resources and make the android_binary target depend on it. +android_library( + name = "MusicResources", + srcs = [], + custom_package = "com.android.music", + manifest = "AndroidManifest.xml", + resource_files = glob(["res/**"]), + visibility = ["//visibility:public"], +) |