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

Merge "Add missing calls to InitSdkAwareModule"

Browse Source
This commit is contained in:
Paul Duffin
2021-05-07 12:15:16 +00:00
committed by Gerrit Code Review
parent c76155cd71 b6b89a4074
commit 820ed78954
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -669,6 +669,7 @@ func LibraryHostFactory() android.Module {
module.Module.properties.Installable = proptools.BoolPtr(true) module.Module.properties.Installable = proptools.BoolPtr(true)
android.InitApexModule(module) android.InitApexModule(module)
android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostSupported) InitJavaModule(module, android.HostSupported)
return module return module
} }
@@ -923,6 +924,7 @@ func TestFactory() android.Module {
module.Module.dexpreopter.isTest = true module.Module.dexpreopter.isTest = true
module.Module.linter.test = true module.Module.linter.test = true
android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported) InitJavaModule(module, android.HostAndDeviceSupported)
return module return module
} }

1
java/sdk_library.go
View File

@@ -1756,6 +1756,7 @@ func SdkLibraryFactory() android.Module {
module.InitSdkLibraryProperties() module.InitSdkLibraryProperties()
android.InitApexModule(module) android.InitApexModule(module)
android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported) InitJavaModule(module, android.HostAndDeviceSupported)
// Initialize the map from scope to scope specific properties. // Initialize the map from scope to scope specific properties.

1
java/system_modules.go
View File

@@ -115,6 +115,7 @@ func SystemModulesFactory() android.Module {
module.AddProperties(&module.properties) module.AddProperties(&module.properties)
android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon) android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module) android.InitDefaultableModule(module)
android.InitSdkAwareModule(module)
return module return module
} }