diff options
| author | 2021-02-15 17:54:43 +0900 | |
|---|---|---|
| committer | 2021-02-16 06:58:57 +0900 | |
| commit | 0671146fd096ff3a8955e80686d2ecfc91d511dd (patch) | |
| tree | 09647b6beec41126791d8922226fdb2fa07018ee | |
| parent | 76a42f5c25cb02313ad6e6b026b237a0e708e769 (diff) | |
filesystems property can be specific to arch
Some filesystems (like boot_image type) are arch-specific. This change
allows us to have filesystems property inside the arch.<arch> struct.
Bug: 178978059
Test: m
Change-Id: I09faa6186b4a3fa35f348fc0805d894b4dc27ffd
| -rw-r--r-- | apex/apex.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index cfeac72a0..e06a96730 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -208,6 +208,9 @@ type ApexNativeDependencies struct { // List of native tests that are embedded inside this APEX. Tests []string + + // List of filesystem images that are embedded inside this APEX bundle. + Filesystems []string } type apexMultilibProperties struct { @@ -580,6 +583,7 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext, nativeM ctx.AddFarVariationDependencies(libVariations, jniLibTag, nativeModules.Jni_libs...) ctx.AddFarVariationDependencies(libVariations, sharedLibTag, nativeModules.Native_shared_libs...) ctx.AddFarVariationDependencies(rustLibVariations, sharedLibTag, nativeModules.Rust_dyn_libs...) + ctx.AddFarVariationDependencies(target.Variations(), fsTag, nativeModules.Filesystems...) } func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) { |