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

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

Browse Source 
Change-Id: Ic0ed8e5bc130d72d357e590f8d546513c84551e3
This commit is contained in:
Jooyung Han
2020-05-15 00:04:59 +00:00
committed by Automerger Merge Worker
parent 6c458f1636 b9d65417c3
commit 06febdf2bb
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/apex.go
View File

@@ -421,21 +421,15 @@ type ApexModuleDepInfo struct {
type DepNameToDepInfoMap map[string]ApexModuleDepInfo type DepNameToDepInfoMap map[string]ApexModuleDepInfo
type ApexBundleDepsInfo struct { type ApexBundleDepsInfo struct {
minSdkVersion string flatListPath OutputPath
flatListPath OutputPath fullListPath OutputPath
fullListPath OutputPath
} }
type ApexDepsInfoIntf interface { type ApexDepsInfoIntf interface {
MinSdkVersion() string
FlatListPath() Path FlatListPath() Path
FullListPath() Path FullListPath() Path
} }
func (d *ApexBundleDepsInfo) MinSdkVersion() string {
return d.minSdkVersion
}
func (d *ApexBundleDepsInfo) FlatListPath() Path { func (d *ApexBundleDepsInfo) FlatListPath() Path {
return d.flatListPath return d.flatListPath
} }
@@ -450,8 +444,6 @@ var _ ApexDepsInfoIntf = (*ApexBundleDepsInfo)(nil)
// 1. FullList with transitive deps and their parents in the dep graph // 1. FullList with transitive deps and their parents in the dep graph
// 2. FlatList with a flat list of transitive deps // 2. FlatList with a flat list of transitive deps
func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion string, depInfos DepNameToDepInfoMap) { func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion string, depInfos DepNameToDepInfoMap) {
d.minSdkVersion = minSdkVersion
var fullContent strings.Builder var fullContent strings.Builder
var flatContent strings.Builder var flatContent strings.Builder