From 4736185b4b6c379a309218b71d15d4f93727dd3c Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Thu, 23 Jan 2025 19:28:17 +0000 Subject: Clean up some of the code around effective license. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I01f0407e4eb6050b556bfebc1cc4d1abd29ad4a6 --- android/module.go | 7 ------- 1 file changed, 7 deletions(-) (limited to 'android/module.go') diff --git a/android/module.go b/android/module.go index c81380eea..14dbb69e8 100644 --- a/android/module.go +++ b/android/module.go @@ -94,7 +94,6 @@ type Module interface { ReplacedByPrebuilt() IsReplacedByPrebuilt() bool ExportedToMake() bool - EffectiveLicenseKinds() []string EffectiveLicenseFiles() Paths AddProperties(props ...interface{}) @@ -315,8 +314,6 @@ type commonProperties struct { // Describes the licenses applicable to this module. Must reference license modules. Licenses []string - // Flattened from direct license dependencies. Equal to Licenses unless particular module adds more. - Effective_licenses []string `blueprint:"mutated"` // Override of module name when reporting licenses Effective_package_name *string `blueprint:"mutated"` // Notice files @@ -1459,10 +1456,6 @@ func (m *ModuleBase) ExportedToMake() bool { return m.commonProperties.NamespaceExportedToMake } -func (m *ModuleBase) EffectiveLicenseKinds() []string { - return m.commonProperties.Effective_license_kinds -} - func (m *ModuleBase) EffectiveLicenseFiles() Paths { result := make(Paths, 0, len(m.commonProperties.Effective_license_text)) for _, p := range m.commonProperties.Effective_license_text { -- cgit v1.2.3-59-g8ed1b