Merge "Remove ApexBundleDepsInfo.MinSdkVersion()" (b9d65417) · Commits · e / os / android_build_soong

android/apex.go

+2 −10

Original line number	Diff line number	Diff line
		@@ -421,21 +421,15 @@ type ApexModuleDepInfo struct {
		type DepNameToDepInfoMap map[string]ApexModuleDepInfo

		type ApexBundleDepsInfo struct {
		minSdkVersion string
		flatListPath OutputPath
		fullListPath OutputPath
		}

		type ApexDepsInfoIntf interface {
		MinSdkVersion() string
		FlatListPath() Path
		FullListPath() Path
		}

		func (d *ApexBundleDepsInfo) MinSdkVersion() string {
		return d.minSdkVersion
		}

		func (d *ApexBundleDepsInfo) FlatListPath() Path {
		return d.flatListPath
		}
		@@ -450,8 +444,6 @@ var _ ApexDepsInfoIntf = (*ApexBundleDepsInfo)(nil)
		// 1. FullList with transitive deps and their parents in the dep graph
		// 2. FlatList with a flat list of transitive deps
		func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion string, depInfos DepNameToDepInfoMap) {
		d.minSdkVersion = minSdkVersion

		var fullContent strings.Builder
		var flatContent strings.Builder