Add the name of the sdk library to dynamically generated java modules

The name of the sdk library will be used in source vs prebuilt
selection. For soong modules that are not dynamically created from a
java_sdk_library, the value will be nil.

Bug: 308174768
Test: TH
Change-Id: Ic7e9889f00c6184992b663a7124967bb0794d475
This commit is contained in:
Spandan Das
2023-10-27 17:21:52 +00:00
parent ee44d32add
commit 2cc80ba145
3 changed files with 14 additions and 4 deletions

View File

@@ -1612,6 +1612,7 @@ func BinaryHostFactory() android.Module {
type JavaApiContribution struct {
android.ModuleBase
android.DefaultableModuleBase
embeddableInModuleAndImport
properties struct {
// name of the API surface
@@ -1627,6 +1628,7 @@ func ApiContributionFactory() android.Module {
android.InitAndroidModule(module)
android.InitDefaultableModule(module)
module.AddProperties(&module.properties)
module.initModuleAndImport(module)
return module
}
@@ -1655,6 +1657,7 @@ type ApiLibrary struct {
hiddenAPI
dexer
embeddableInModuleAndImport
properties JavaApiLibraryProperties
@@ -1713,6 +1716,7 @@ func ApiLibraryFactory() android.Module {
module := &ApiLibrary{}
android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
module.AddProperties(&module.properties)
module.initModuleAndImport(module)
android.InitDefaultableModule(module)
return module
}
@@ -3512,6 +3516,7 @@ func ApiContributionImportFactory() android.Module {
android.InitDefaultableModule(module)
android.InitPrebuiltModule(module, &[]string{""})
module.AddProperties(&module.properties)
module.AddProperties(&module.sdkLibraryComponentProperties)
return module
}