diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/apex/apex.go b/apex/apex.go index 8424b8216..58cbb13e9 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -984,9 +984,6 @@ type apexBundleProperties struct { // List of providing APEXes' names so that this APEX can depend on provided shared libraries. Uses []string - // A txt file containing list of files that are allowed to be included in this APEX. - Allowed_files *string - // package format of this apex variant; could be non-flattened, flattened, or zip. // imageApex, zipApex or flattened ApexType apexPackaging `blueprint:"mutated"` @@ -1062,6 +1059,9 @@ type overridableProperties struct { // Apex Container Package Name. // Override value for attribute package:name in AndroidManifest.xml Package_name string + + // A txt file containing list of files that are allowed to be included in this APEX. + Allowed_files *string `android:"path"` } type apexPackaging int @@ -1453,6 +1453,9 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) { } func (a *apexBundle) OverridablePropertiesDepsMutator(ctx android.BottomUpMutatorContext) { + if a.overridableProperties.Allowed_files != nil { + android.ExtractSourceDeps(ctx, a.overridableProperties.Allowed_files) + } ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(), androidAppTag, a.overridableProperties.Apps...) ctx.AddFarVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(), @@ -1552,7 +1555,7 @@ func (a *apexBundle) AddSanitizerDependencies(ctx android.BottomUpMutatorContext var _ cc.Coverage = (*apexBundle)(nil) func (a *apexBundle) IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool { - return ctx.Device() && (ctx.DeviceConfig().NativeCoverageEnabled() || ctx.DeviceConfig().ClangCoverageEnabled()) + return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled() } func (a *apexBundle) PreventInstall() { |