openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Extract createEntriesForApexFile" into sc-dev am: 1970d6c5ce 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15027224

Change-Id: I5ea3c0f9f00d4018f41ab7f482298314c67dead4
This commit is contained in:
Paul Duffin 2021-06-20 18:28:38 +00:00 committed by Automerger Merge Worker
parent ee7c4620dc 1970d6c5ce
commit f2e652126c
1 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apex/prebuilt.go
View File

@ -216,6 +216,15 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries {
// apex specific variants of the exported java modules available for use from within make.
apexName := p.BaseModuleName()
for _, fi := range p.apexFilesForAndroidMk {
entries := p.createEntriesForApexFile(fi, apexName)
entriesList = append(entriesList, entries)
}
return entriesList
}
// createEntriesForApexFile creates an AndroidMkEntries for the supplied apexFile
func (p *prebuiltCommon) createEntriesForApexFile(fi apexFile, apexName string) android.AndroidMkEntries {
moduleName := fi.androidMkModuleName + "." + apexName
entries := android.AndroidMkEntries{
Class: fi.class.nameInMake(),
@ -255,11 +264,7 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries {
},
},
}
entriesList = append(entriesList, entries)
}
return entriesList
return entries
}
// prebuiltApexModuleCreator defines the methods that need to be implemented by prebuilt_apex and