From dbd8eb11f421a3d852d0b593874e77b9c9ce12da Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 21 Apr 2022 11:13:45 -0400 Subject: Remove unused uses_sdks property for apexes (cherry picked from commit 7eed538208b6b158daa39504122545450db6c2e3) Bug: 232546567 Test: m nothing & compare build.ninja before/after Merged-In: I3f1199af338e1d2e48ec29cf9f59b6b36236c4cc Change-Id: I3f1199af338e1d2e48ec29cf9f59b6b36236c4cc --- android/apex.go | 6 ------ 1 file changed, 6 deletions(-) (limited to 'android/apex.go') diff --git a/android/apex.go b/android/apex.go index b127f7410..63cdaaf5e 100644 --- a/android/apex.go +++ b/android/apex.go @@ -58,9 +58,6 @@ type ApexInfo struct { // to true. UsePlatformApis bool - // The list of SDK modules that the containing apexBundle depends on. - RequiredSdks SdkRefs - // List of Apex variant names that this module is associated with. This initially is the // same as the `ApexVariationName` field. Then when multiple apex variants are merged in // mergeApexVariations, ApexInfo struct of the merged variant holds the list of apexBundles @@ -110,9 +107,6 @@ func (i ApexInfo) AddJSONData(d *map[string]interface{}) { // thus wouldn't be merged. func (i ApexInfo) mergedName(ctx PathContext) string { name := "apex" + strconv.Itoa(i.MinSdkVersion.FinalOrFutureInt()) - for _, sdk := range i.RequiredSdks { - name += "_" + sdk.Name + "_" + sdk.Version - } return name } -- cgit v1.2.3-59-g8ed1b