StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "apex: make allowed_files prop overridable" into rvc-dev am: d166f79278

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/11931025

Change-Id: I2600c560d596446af255b117abfc07dc1d1f1860
This commit is contained in:
Jooyung Han
2020-06-22 17:20:52 +00:00
committed by Automerger Merge Worker
parent ff6e55b301 d166f79278
commit b365f35fef
3 changed files with 63 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apex/apex.go
View File

@@ -1020,9 +1020,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"`
@@ -1098,6 +1095,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
@@ -1489,6 +1489,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(),