Soong generates vndk-related .libraries.txt files
This is a follow-up CL of I9a24f6975bd4b226a94f61a13d43857dcdce6b88 Generated files are passed to make via MakeVars: - SOONG_LLNDK_LIBRARIES_FILE - SOONG_VNDKCORE_LIBRARIES_FILE - SOONG_VNDKSP_LIBRARIES_FILE - SOONG_VNDKPRIVATE_LIBRARIES_FILE - SOONG_VNDKCOREVARIANT_LIBRARIES_FILE - SOONG_VNDK_LIBRARIES_FILE Previously filenames were "guessed" from module names. Now VndkMutator stores filenames as well and generate those files with them. Bug: 142963962 Bug: 141450808 Test: m && device boots && TH Change-Id: I0c248b707188f904df60ead50059fefe90bfd17f
This commit is contained in:
@@ -579,24 +579,28 @@ type libraryInterface interface {
|
||||
availableFor(string) bool
|
||||
}
|
||||
|
||||
func (library *libraryDecorator) getLibName(ctx BaseModuleContext) string {
|
||||
func (library *libraryDecorator) getLibNameHelper(baseModuleName string, useVndk bool) string {
|
||||
name := library.libName
|
||||
if name == "" {
|
||||
name = String(library.Properties.Stem)
|
||||
if name == "" {
|
||||
name = ctx.baseModuleName()
|
||||
name = baseModuleName
|
||||
}
|
||||
}
|
||||
|
||||
suffix := ""
|
||||
if ctx.useVndk() {
|
||||
if useVndk {
|
||||
suffix = String(library.Properties.Target.Vendor.Suffix)
|
||||
}
|
||||
if suffix == "" {
|
||||
suffix = String(library.Properties.Suffix)
|
||||
}
|
||||
|
||||
name += suffix
|
||||
return name + suffix
|
||||
}
|
||||
|
||||
func (library *libraryDecorator) getLibName(ctx BaseModuleContext) string {
|
||||
name := library.getLibNameHelper(ctx.baseModuleName(), ctx.useVndk())
|
||||
|
||||
if ctx.isVndkExt() {
|
||||
// vndk-ext lib should have the same name with original lib
|
||||
|
Reference in New Issue
Block a user