diff options
| author | 2021-03-30 12:14:58 +0100 | |
|---|---|---|
| committer | 2021-03-30 12:21:21 +0100 | |
| commit | 459d9506eea5087661f905e21632c099250eec65 (patch) | |
| tree | ca958489d662db4513ea71c777e4fae53355d007 | |
| parent | fbb283fb4db0cdde047362354091a8201e5a196b (diff) | |
Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"
Cherry-pick the change to the media filegroup in the root Android.bp
to avoid merge conflicts in upcoming changes.
Test: m nothing
Merged-In: I46acdd2f118d5b082aa162c680661a304b4f628b
Change-Id: Ic55df4cfeb295cfa1657c64f9747c90e30cb73a2
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | media/java/android/media/tv/tunerresourcemanager/Android.bp | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 93248e0f8586..5d86043cf61e 100644 --- a/Android.bp +++ b/Android.bp @@ -226,6 +226,9 @@ filegroup { "media/java/**/*.java", "media/java/**/*.aidl", ], + exclude_srcs: [ + ":framework-media-tv-tunerresourcemanager-sources-aidl", + ], path: "media/java", } diff --git a/media/java/android/media/tv/tunerresourcemanager/Android.bp b/media/java/android/media/tv/tunerresourcemanager/Android.bp index 66c7bd4a1f2b..e365ee11067d 100644 --- a/media/java/android/media/tv/tunerresourcemanager/Android.bp +++ b/media/java/android/media/tv/tunerresourcemanager/Android.bp @@ -6,6 +6,12 @@ package { // SPDX-license-identifier-Apache-2.0 default_applicable_licenses: ["frameworks_base_license"], } +filegroup { + // NOTE: This is purposefully left empty, and exists only so that it can be + // referenced in frameworks/base/Android.bp. + name: "framework-media-tv-tunerresourcemanager-sources-aidl", + srcs: [], +} filegroup { name: "framework-media-tv-tunerresourcemanager-sources", |