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

Merge "Remove unnecessary ConfiguredJarList.apex(int) method" am: 728e626cb6 am: fc383ac1bd am: e7122d9e88

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1471774

Change-Id: I35f89911ae3a08107514f7f44ee92ab2d1175f0b
This commit is contained in:
Paul Duffin
2020-10-26 21:15:36 +00:00
committed by Automerger Merge Worker
parent e1df571026 e7122d9e88
commit 60b9747bc5
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/config.go
View File

@@ -1336,11 +1336,6 @@ func (l *ConfiguredJarList) Len() int {
return len(l.jars) return len(l.jars)
} }
// Apex component of idx-th pair on the list.
func (l *ConfiguredJarList) apex(idx int) string {
return l.apexes[idx]
}
// Jar component of idx-th pair on the list. // Jar component of idx-th pair on the list.
func (l *ConfiguredJarList) Jar(idx int) string { func (l *ConfiguredJarList) Jar(idx int) string {
return l.jars[idx] return l.jars[idx]
@@ -1354,7 +1349,7 @@ func (l *ConfiguredJarList) ContainsJar(jar string) bool {
// If the list contains the given (apex, jar) pair. // If the list contains the given (apex, jar) pair.
func (l *ConfiguredJarList) containsApexJarPair(apex, jar string) bool { func (l *ConfiguredJarList) containsApexJarPair(apex, jar string) bool {
for i := 0; i < l.Len(); i++ { for i := 0; i < l.Len(); i++ {
if apex == l.apex(i) && jar == l.Jar(i) { if apex == l.apexes[i] && jar == l.jars[i] {
return true return true
} }
} }
@@ -1378,7 +1373,7 @@ func (l *ConfiguredJarList) RemoveList(list ConfiguredJarList) {
jars := make([]string, 0, l.Len()) jars := make([]string, 0, l.Len())
for i, jar := range l.jars { for i, jar := range l.jars {
apex := l.apex(i) apex := l.apexes[i]
if !list.containsApexJarPair(apex, jar) { if !list.containsApexJarPair(apex, jar) {
apexes = append(apexes, apex) apexes = append(apexes, apex)
jars = append(jars, jar) jars = append(jars, jar)
@@ -1404,7 +1399,7 @@ func (l *ConfiguredJarList) CopyOfApexJarPairs() []string {
pairs := make([]string, 0, l.Len()) pairs := make([]string, 0, l.Len())
for i, jar := range l.jars { for i, jar := range l.jars {
apex := l.apex(i) apex := l.apexes[i]
pairs = append(pairs, apex+":"+jar) pairs = append(pairs, apex+":"+jar)
} }