Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partial cp of "Move Tuner resource updating from Tuner java into Tuner client"

Browse Source 
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
This commit is contained in:
Anton Hansson
2021-03-30 12:14:58 +01:00
parent fbb283fb4d
commit 459d9506ee
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Android.bp
View File

@@ -226,6 +226,9 @@ filegroup {
"media/java/**/*.java", "media/java/**/*.java",
"media/java/**/*.aidl", "media/java/**/*.aidl",
], ],
exclude_srcs: [
":framework-media-tv-tunerresourcemanager-sources-aidl",
],
path: "media/java", path: "media/java",
} }

6
media/java/android/media/tv/tunerresourcemanager/Android.bp
View File

@@ -6,6 +6,12 @@ package {
// SPDX-license-identifier-Apache-2.0 // SPDX-license-identifier-Apache-2.0
default_applicable_licenses: ["frameworks_base_license"], 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 { filegroup {
name: "framework-media-tv-tunerresourcemanager-sources", name: "framework-media-tv-tunerresourcemanager-sources",