Merge "Remove ApexBundleDepsInfo.MinSdkVersion()" am: b9d65417c3 am: 06febdf2bb

Change-Id: Ie3f0e84cca29f26bd607e43a96592e078c62ead3
This commit is contained in:
Jooyung Han 2020-05-15 00:17:57 +00:00 committed by Automerger Merge Worker
commit b442db2b39
1 changed files with 2 additions and 10 deletions

View File

@ -421,21 +421,15 @@ type ApexModuleDepInfo struct {
type DepNameToDepInfoMap map[string]ApexModuleDepInfo
type ApexBundleDepsInfo struct {
minSdkVersion string
flatListPath OutputPath
fullListPath OutputPath
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