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

Commit 93a06c10 authored by Jooyung Han's avatar Jooyung Han Committed by Artur Satayev
Browse files

Remove ApexBundleDepsInfo.MinSdkVersion() 

For java.AndroidApp app, app.MinSdkVersion() was selected from
ApexBundleDepsInfo, not from java.Module.
This caused app.MinSdkVersion() to return "" always.

Besides, having two embeded fields and relying on depth to choose one of
them makes it hard to read.

Bug: 156537348
Test: m
Merged-In: Ib525b2f5132c596db8e33492d0a565ea23e91d1c
Change-Id: Ib525b2f5132c596db8e33492d0a565ea23e91d1c
Exempt-From-Owner-Approval: cp from aosp
(cherry picked from commit 98d63e1c)
parent c0eb0b1a

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