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

Merge "Switch java_sdk_library to use SetDefaultableHook()"

Browse Source
This commit is contained in:
Treehugger Robot
2020-05-07 20:39:05 +00:00
committed by Gerrit Code Review
parent 7500f46b95 f022920bde
commit 3d60daadbc
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/sdk_library.go
View File

@@ -387,7 +387,7 @@ func (module *SdkLibrary) apiDistPath(apiScope *apiScope) string {
} }
// Get the sdk version for use when compiling the stubs library. // Get the sdk version for use when compiling the stubs library.
func (module *SdkLibrary) sdkVersionForStubsLibrary(mctx android.LoadHookContext, apiScope *apiScope) string { func (module *SdkLibrary) sdkVersionForStubsLibrary(mctx android.DefaultableHookContext, apiScope *apiScope) string {
sdkDep := decodeSdkDep(mctx, sdkContext(&module.Library)) sdkDep := decodeSdkDep(mctx, sdkContext(&module.Library))
if sdkDep.hasStandardLibs() { if sdkDep.hasStandardLibs() {
// If building against a standard sdk then use the sdk version appropriate for the scope. // If building against a standard sdk then use the sdk version appropriate for the scope.
@@ -407,7 +407,7 @@ func (module *SdkLibrary) latestRemovedApiFilegroupName(apiScope *apiScope) stri
} }
// Creates a static java library that has API stubs // Creates a static java library that has API stubs
func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiScope *apiScope) { func (module *SdkLibrary) createStubsLibrary(mctx android.DefaultableHookContext, apiScope *apiScope) {
props := struct { props := struct {
Name *string Name *string
Srcs []string Srcs []string
@@ -478,7 +478,7 @@ func (module *SdkLibrary) createStubsLibrary(mctx android.LoadHookContext, apiSc
// Creates a droidstubs module that creates stubs source files from the given full source // Creates a droidstubs module that creates stubs source files from the given full source
// files // files
func (module *SdkLibrary) createStubsSources(mctx android.LoadHookContext, apiScope *apiScope) { func (module *SdkLibrary) createStubsSources(mctx android.DefaultableHookContext, apiScope *apiScope) {
props := struct { props := struct {
Name *string Name *string
Srcs []string Srcs []string
@@ -597,7 +597,7 @@ func (module *SdkLibrary) DepIsInSameApex(mctx android.BaseModuleContext, dep an
} }
// Creates the xml file that publicizes the runtime library // Creates the xml file that publicizes the runtime library
func (module *SdkLibrary) createXmlFile(mctx android.LoadHookContext) { func (module *SdkLibrary) createXmlFile(mctx android.DefaultableHookContext) {
props := struct { props := struct {
Name *string Name *string
Lib_name *string Lib_name *string
@@ -718,7 +718,12 @@ func (module *SdkLibrary) getApiDir() string {
// For a java_sdk_library module, create internal modules for stubs, docs, // For a java_sdk_library module, create internal modules for stubs, docs,
// runtime libs and xml file. If requested, the stubs and docs are created twice // runtime libs and xml file. If requested, the stubs and docs are created twice
// once for public API level and once for system API level // once for public API level and once for system API level
func (module *SdkLibrary) CreateInternalModules(mctx android.LoadHookContext) { func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookContext) {
// If the module has been disabled then don't create any child modules.
if !module.Enabled() {
return
}
if len(module.Library.Module.properties.Srcs) == 0 { if len(module.Library.Module.properties.Srcs) == 0 {
mctx.PropertyErrorf("srcs", "java_sdk_library must specify srcs") mctx.PropertyErrorf("srcs", "java_sdk_library must specify srcs")
return return
@@ -804,7 +809,7 @@ func SdkLibraryFactory() android.Module {
module.InitSdkLibraryProperties() module.InitSdkLibraryProperties()
android.InitApexModule(module) android.InitApexModule(module)
InitJavaModule(module, android.HostAndDeviceSupported) InitJavaModule(module, android.HostAndDeviceSupported)
android.AddLoadHook(module, func(ctx android.LoadHookContext) { module.CreateInternalModules(ctx) }) module.SetDefaultableHook(func(ctx android.DefaultableHookContext) { module.CreateInternalModules(ctx) })
return module return module
} }