Merge "Utilize high_priority_deps in autogenerated filesystem modules" into main (f5755e17) · Commits · e / os / android_build_soong

fsgen/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ bootstrap_go_package {
		"filesystem_creator_test.go",
		],
		pluginFor: ["soong_build"],
		visibility: ["//visibility:public"],
		}

		soong_filesystem_creator {

+8 −3

Original line number	Diff line number	Diff line
		@@ -229,6 +229,7 @@ type multilibDepsStruct struct {
		}

		type packagingPropsStruct struct {
		High_priority_deps []string
		Deps []string
		Multilib multilibDepsStruct
		}
		@@ -306,12 +307,16 @@ func removeOverriddenDeps(mctx android.BottomUpMutatorContext) {
		})
		}

		var HighPriorityDeps = []string{}

		func generateDepStruct(deps map[string]depCandidateProps) packagingPropsStruct {
		depsStruct := packagingPropsStruct{}
		for depName, depProps := range deps {
		bitness := getBitness(depProps.Arch)
		fullyQualifiedDepName := fullyQualifiedModuleName(depName, depProps.Namespace)
		if android.InList("32", bitness) && android.InList("64", bitness) {
		if android.InList(depName, HighPriorityDeps) {
		depsStruct.High_priority_deps = append(depsStruct.High_priority_deps, fullyQualifiedDepName)
		} else if android.InList("32", bitness) && android.InList("64", bitness) {
		// If both 32 and 64 bit variants are enabled for this module
		switch depProps.Multilib {
		case string(android.MultilibBoth):