diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:11:20 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-07 05:11:20 +0000 |
| commit | afe01b9ada4725faf757de4cf1440286e1630fc4 (patch) | |
| tree | 95cf4a3e5b2c223ac65c353250d65a2badd3a4a6 | |
| parent | 53c7fbc07bf73d95053389ddac0e312fdc9f2e36 (diff) | |
| parent | 0419b9f2da9a9f813e151256d2f365e19daa5788 (diff) | |
| download | Music-android14-mainline-os-statsd-release.tar.gz | |
Snap for 10453563 from 0419b9f2da9a9f813e151256d2f365e19daa5788 to mainline-os-statsd-releaseaml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_net_341111030android14-mainline-os-statsd-release
Change-Id: I20e364c6a429afe6cfdbe9cac95927a12441413f
| -rw-r--r-- | BUILD | 8 | ||||
| -rw-r--r-- | kotlin/BUILD | 33 |
2 files changed, 9 insertions, 32 deletions
@@ -1,9 +1,13 @@ -load("@rules_android//rules:rules.bzl", "android_binary", "android_library") +load("//build/bazel/rules/android:rules.bzl", "android_binary") android_binary( name = "Music", srcs = glob(["src/**/*.java"]), custom_package = "com.android.music", manifest = "AndroidManifest.xml", - deps = ["//packages/apps/Music/kotlin:MusicResources"], + # TODO(b/179889880): this manual BUILD file exists because these resources, + # if listed as files, would cross package boundary. + resource_files = ["//packages/apps/Music/kotlin:MusicResourceFiles"], + sdk_version = "current", + target_compatible_with = ["//build/bazel/platforms/os:android"], ) diff --git a/kotlin/BUILD b/kotlin/BUILD index ab0691c..40c96d3 100644 --- a/kotlin/BUILD +++ b/kotlin/BUILD @@ -1,31 +1,4 @@ -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"], +filegroup( + name = "MusicResourceFiles", + srcs = glob(["res/**"]), ) |