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

Remove unnecessary additionalCheckedModules field am: 0b58fdb058

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

Change-Id: Ic6e55395138cfed7257529b2c5165bb4907460e1
This commit is contained in:
Paul Duffin
2021-10-04 11:11:47 +00:00
committed by Automerger Merge Worker
parent 12d6b80da2 0b58fdb058
commit 6c68db45d3
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/androidmk.go
View File

@@ -71,23 +71,7 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries {
entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true}) entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true})
} else if !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) { } else if !library.ApexModuleBase.AvailableFor(android.AvailableToPlatform) {
// Platform variant. If not available for the platform, we don't need Make module. // Platform variant. If not available for the platform, we don't need Make module.
// May still need to add some additional dependencies. entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true})
checkedModulePaths := library.additionalCheckedModules
if len(checkedModulePaths) != 0 {
entriesList = append(entriesList, android.AndroidMkEntries{
Class: "FAKE",
// Need at least one output file in order for this to take effect.
OutputFile: android.OptionalPathForPath(checkedModulePaths[0]),
Include: "$(BUILD_PHONY_PACKAGE)",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
entries.AddStrings("LOCAL_ADDITIONAL_CHECKED_MODULE", checkedModulePaths.Strings()...)
},
},
})
} else {
entriesList = append(entriesList, android.AndroidMkEntries{Disabled: true})
}
} else { } else {
entriesList = append(entriesList, android.AndroidMkEntries{ entriesList = append(entriesList, android.AndroidMkEntries{
Class: "JAVA_LIBRARIES", Class: "JAVA_LIBRARIES",
@@ -123,10 +107,6 @@ func (library *Library) AndroidMkEntries() []android.AndroidMkEntries {
requiredUsesLibs, optionalUsesLibs := library.classLoaderContexts.UsesLibs() requiredUsesLibs, optionalUsesLibs := library.classLoaderContexts.UsesLibs()
entries.AddStrings("LOCAL_EXPORT_SDK_LIBRARIES", append(requiredUsesLibs, optionalUsesLibs...)...) entries.AddStrings("LOCAL_EXPORT_SDK_LIBRARIES", append(requiredUsesLibs, optionalUsesLibs...)...)
if len(library.additionalCheckedModules) != 0 {
entries.AddStrings("LOCAL_ADDITIONAL_CHECKED_MODULE", library.additionalCheckedModules.Strings()...)
}
entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_DICT", library.dexer.proguardDictionary) entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_DICT", library.dexer.proguardDictionary)
entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_USAGE_ZIP", library.dexer.proguardUsageZip) entries.SetOptionalPath("LOCAL_SOONG_PROGUARD_USAGE_ZIP", library.dexer.proguardUsageZip)
entries.SetString("LOCAL_MODULE_STEM", library.Stem()) entries.SetString("LOCAL_MODULE_STEM", library.Stem())

3
java/base.go
View File

@@ -433,9 +433,6 @@ type Module struct {
// expanded Jarjar_rules // expanded Jarjar_rules
expandJarjarRules android.Path expandJarjarRules android.Path
// list of additional targets for checkbuild
additionalCheckedModules android.Paths
// Extra files generated by the module type to be added as java resources. // Extra files generated by the module type to be added as java resources.
extraResources android.Paths extraResources android.Paths