diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/android/module.go b/android/module.go index b0ad89bb2..cfb32c126 100644 --- a/android/module.go +++ b/android/module.go @@ -619,20 +619,6 @@ type commonProperties struct { // more details. Visibility []string - // 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 - Effective_license_text []string `blueprint:"mutated"` - // License names - Effective_license_kinds []string `blueprint:"mutated"` - // License conditions - Effective_license_conditions []string `blueprint:"mutated"` - // control whether this module compiles for 32-bit, 64-bit, or both. Possible values // are "32" (compile for 32-bit only), "64" (compile for 64-bit only), "both" (compile for both // architectures), or "first" (compile for 64-bit on a 64-bit platform, and 32-bit on a 32-bit @@ -954,10 +940,6 @@ func InitAndroidModule(m Module) { // The default_visibility property needs to be checked and parsed by the visibility module during // its checking and parsing phases so make it the primary visibility property. setPrimaryVisibilityProperty(m, "visibility", &base.commonProperties.Visibility) - - // The default_applicable_licenses property needs to be checked and parsed by the licenses module during - // its checking and parsing phases so make it the primary licenses property. - setPrimaryLicensesProperty(m, "licenses", &base.commonProperties.Licenses) } // InitAndroidArchModule initializes the Module as an Android module that is architecture-specific. @@ -1075,9 +1057,6 @@ type ModuleBase struct { // The primary visibility property, may be nil, that controls access to the module. primaryVisibilityProperty visibilityProperty - // The primary licenses property, may be nil, records license metadata for the module. - primaryLicensesProperty applicableLicensesProperty - noAddressSanitizer bool installFiles InstallPaths installFilesDepSet *installPathsDepSet @@ -1753,11 +1732,6 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) } } - licensesPropertyFlattener(ctx) - if ctx.Failed() { - return - } - m.module.GenerateAndroidBuildActions(ctx) if ctx.Failed() { return |