Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1e4bb23 authored by Bill Peckham's avatar Bill Peckham Committed by Automerger Merge Worker
Browse files

Merge "Adds 'kernel/' to vendor proprietary dirs." am: 6ed58903 am: 25bd47b9 

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

Change-Id: I4a35c4b9c267f23ababe67e349a333431bad53d0
parents 898ed67e 25bd47b9

cc/vendor_snapshot.go

+6 −2
Original line number Diff line number Diff line
@@ -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",