Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5e6d8ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add VNDK apexes to deps of autogenerated system_ext partition" into main

parents 79de2a5e d9875bc1

fsgen/filesystem_creator.go

+13 −4
Original line number Diff line number Diff line
@@ -127,7 +127,16 @@ func createFsGenState(ctx android.LoadHookContext) *FsGenState { 
				"vendor":  newMultilibDeps(),

				"odm":     newMultilibDeps(),

				"product": newMultilibDeps(),

				"system_ext": newMultilibDeps(),

				"system_ext": &map[string]*depCandidateProps{

					// VNDK apexes are automatically included.

					// This hardcoded list will need to be updated if `PRODUCT_EXTRA_VNDK_VERSIONS` is updated.

					// https://cs.android.com/android/_/android/platform/build/+/adba533072b00c53ac0f198c550a3cbd7a00e4cd:core/main.mk;l=984;bpv=1;bpt=0;drc=174db7b179592cf07cbfd2adb0119486fda911e7

					"com.android.vndk.v30": defaultDepCandidateProps(ctx.Config()),

					"com.android.vndk.v31": defaultDepCandidateProps(ctx.Config()),

					"com.android.vndk.v32": defaultDepCandidateProps(ctx.Config()),

					"com.android.vndk.v33": defaultDepCandidateProps(ctx.Config()),

					"com.android.vndk.v34": defaultDepCandidateProps(ctx.Config()),

				},

			},

			soongGeneratedPartitions: generatedPartitions,

			fsDepsMutex:              sync.Mutex{},