From 713387dc75d8824fbaecdb698ad2a018659b295a Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Tue, 28 Jul 2020 16:04:38 -0700 Subject: [PATCH] Adds 'kernel/' to vendor proprietary dirs. Bug: 161722183 Test: m nothing Change-Id: I45c9e8623304617268a725ea5f0c353352f80590 --- cc/vendor_snapshot.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cc/vendor_snapshot.go b/cc/vendor_snapshot.go index 0af22580a..6df940c79 100644 --- a/cc/vendor_snapshot.go +++ b/cc/vendor_snapshot.go @@ -484,18 +484,22 @@ type vendorSnapshotSingleton struct { var ( // 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 vendorProprietaryDirs = []string{ "device", + "kernel", "vendor", "hardware", } // 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 aospDirsUnderProprietary = []string{ + "kernel/configs", + "kernel/prebuilts", + "kernel/tests", "hardware/interfaces", "hardware/libhardware", "hardware/libhardware_legacy",