StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adds 'kernel/' to vendor proprietary dirs." am: 6ed589039c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1387788

Change-Id: I5ef08b2230ed2dbc78f3dde62bd3cca8705789e9
This commit is contained in:
Bill Peckham
2020-08-05 18:30:07 +00:00
committed by Automerger Merge Worker
parent 46971c5469 6ed589039c
commit 25bd47b9fa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/vendor_snapshot.go
View File

@@ -484,18 +484,22 @@ type vendorSnapshotSingleton struct {
var ( var (
// Modules under following directories are ignored. They are OEM's and vendor's // Modules under following directories are ignored. They are OEM's and vendor's
// proprietary modules(device/, vendor/, and hardware/). // proprietary modules(device/, kernel/, vendor/, and hardware/).
// TODO(b/65377115): Clean up these with more maintainable way // TODO(b/65377115): Clean up these with more maintainable way
vendorProprietaryDirs = []string{ vendorProprietaryDirs = []string{
"device", "device",
"kernel",
"vendor", "vendor",
"hardware", "hardware",
} }
// Modules under following directories are included as they are in AOSP, // Modules under following directories are included as they are in AOSP,
// although hardware/ is normally for vendor's own. // although hardware/ and kernel/ are normally for vendor's own.
// TODO(b/65377115): Clean up these with more maintainable way // TODO(b/65377115): Clean up these with more maintainable way
aospDirsUnderProprietary = []string{ aospDirsUnderProprietary = []string{
"kernel/configs",
"kernel/prebuilts",
"kernel/tests",
"hardware/interfaces", "hardware/interfaces",
"hardware/libhardware", "hardware/libhardware",
"hardware/libhardware_legacy", "hardware/libhardware_legacy",