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

Make bpfs properties overridable

Browse Source 
To support different variable bpfs file between mainline module and
non-updatable module(e.g. Android GO). Make bpfs properties overridable.

Test: m
Bug: 190523685
Change-Id: I4c63e35f74230de94b21f3ceb2beb90f0f9ddb11
This commit is contained in:
markchien
2021-08-26 22:10:06 +08:00
committed by Mark Chien
parent 35fc86c9cf
commit 7c803b8746
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/apex.go
View File

@@ -117,9 +117,6 @@ type apexBundleProperties struct {
// List of platform_compat_config files that are embedded inside this APEX bundle.
Compat_configs []string
// List of BPF programs inside this APEX bundle.
Bpfs []string
// List of filesystem images that are embedded inside this APEX bundle.
Filesystems []string
@@ -297,6 +294,9 @@ type overridableProperties struct {
// List of runtime resource overlays (RROs) that are embedded inside this APEX.
Rros []string
// List of BPF programs inside this APEX bundle.
Bpfs []string
// Names of modules to be overridden. Listed modules can only be other binaries (in Make or
// Soong). This does not completely prevent installation of the overridden binaries, but if
// both binaries would be installed by default (in PRODUCT_PACKAGES) the other binary will
@@ -780,7 +780,6 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
ctx.AddFarVariationDependencies(commonVariation, bcpfTag, a.properties.Bootclasspath_fragments...)
ctx.AddFarVariationDependencies(commonVariation, sscpfTag, a.properties.Systemserverclasspath_fragments...)
ctx.AddFarVariationDependencies(commonVariation, javaLibTag, a.properties.Java_libs...)
ctx.AddFarVariationDependencies(commonVariation, bpfTag, a.properties.Bpfs...)
ctx.AddFarVariationDependencies(commonVariation, fsTag, a.properties.Filesystems...)
ctx.AddFarVariationDependencies(commonVariation, compatConfigTag, a.properties.Compat_configs...)
@@ -813,6 +812,7 @@ func (a *apexBundle) OverridablePropertiesDepsMutator(ctx android.BottomUpMutato
commonVariation := ctx.Config().AndroidCommonTarget.Variations()
ctx.AddFarVariationDependencies(commonVariation, androidAppTag, a.overridableProperties.Apps...)
ctx.AddFarVariationDependencies(commonVariation, bpfTag, a.overridableProperties.Bpfs...)
ctx.AddFarVariationDependencies(commonVariation, rroTag, a.overridableProperties.Rros...)
// Dependencies for signing