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

Merge "filesystems property can be specific to arch" am: 0cfa585f04

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I337b71a4399a9b1420c331fc6d8936734b05f1d1
This commit is contained in:
Treehugger Robot
2021-02-17 03:51:51 +00:00
committed by Automerger Merge Worker
parent ec70aec881 0cfa585f04
commit f9f5435930
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -208,6 +208,9 @@ type ApexNativeDependencies struct {
// List of native tests that are embedded inside this APEX. // List of native tests that are embedded inside this APEX.
Tests []string Tests []string
// List of filesystem images that are embedded inside this APEX bundle.
Filesystems []string
} }
type apexMultilibProperties struct { type apexMultilibProperties struct {
@@ -580,6 +583,7 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext, nativeM
ctx.AddFarVariationDependencies(libVariations, jniLibTag, nativeModules.Jni_libs...) ctx.AddFarVariationDependencies(libVariations, jniLibTag, nativeModules.Jni_libs...)
ctx.AddFarVariationDependencies(libVariations, sharedLibTag, nativeModules.Native_shared_libs...) ctx.AddFarVariationDependencies(libVariations, sharedLibTag, nativeModules.Native_shared_libs...)
ctx.AddFarVariationDependencies(rustLibVariations, sharedLibTag, nativeModules.Rust_dyn_libs...) ctx.AddFarVariationDependencies(rustLibVariations, sharedLibTag, nativeModules.Rust_dyn_libs...)
ctx.AddFarVariationDependencies(target.Variations(), fsTag, nativeModules.Filesystems...)
} }
func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) { func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) {