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

Merge "Call hook in java_sdk_library after droidstubs generation"

Browse Source
This commit is contained in:
Treehugger Robot
2023-02-07 21:59:20 +00:00
committed by Gerrit Code Review
parent db23e22835 d48abd566b
commit 667200e25b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/defaults.go
View File

@@ -55,7 +55,7 @@ func (d *DefaultableModuleBase) SetDefaultableHook(hook DefaultableHook) {
d.hook = hook d.hook = hook
} }
func (d *DefaultableModuleBase) callHookIfAvailable(ctx DefaultableHookContext) { func (d *DefaultableModuleBase) CallHookIfAvailable(ctx DefaultableHookContext) {
if d.hook != nil { if d.hook != nil {
d.hook(ctx) d.hook(ctx)
} }
@@ -82,7 +82,7 @@ type Defaultable interface {
SetDefaultableHook(hook DefaultableHook) SetDefaultableHook(hook DefaultableHook)
// Call the hook if specified. // Call the hook if specified.
callHookIfAvailable(context DefaultableHookContext) CallHookIfAvailable(context DefaultableHookContext)
} }
type DefaultableModule interface { type DefaultableModule interface {
@@ -630,6 +630,6 @@ func defaultsMutator(ctx TopDownMutatorContext) {
defaultable.applyDefaults(ctx, defaultsList) defaultable.applyDefaults(ctx, defaultsList)
} }
defaultable.callHookIfAvailable(ctx) defaultable.CallHookIfAvailable(ctx)
} }
} }

2
java/sdk_library.go
View File

@@ -1749,7 +1749,7 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC
} }
} }
mctx.CreateModule(DroidstubsFactory, &props) mctx.CreateModule(DroidstubsFactory, &props).(*Droidstubs).CallHookIfAvailable(mctx)
} }
func (module *SdkLibrary) compareAgainstLatestApi(apiScope *apiScope) bool { func (module *SdkLibrary) compareAgainstLatestApi(apiScope *apiScope) bool {

1
java/sdk_library_test.go
View File

@@ -120,6 +120,7 @@ func TestJavaSdkLibrary(t *testing.T) {
result.ModuleForTests(apiScopePublic.stubsSourceModuleName("foo"), "android_common") result.ModuleForTests(apiScopePublic.stubsSourceModuleName("foo"), "android_common")
result.ModuleForTests(apiScopeSystem.stubsSourceModuleName("foo"), "android_common") result.ModuleForTests(apiScopeSystem.stubsSourceModuleName("foo"), "android_common")
result.ModuleForTests(apiScopeTest.stubsSourceModuleName("foo"), "android_common") result.ModuleForTests(apiScopeTest.stubsSourceModuleName("foo"), "android_common")
result.ModuleForTests(apiScopePublic.stubsSourceModuleName("foo")+".api.contribution", "")
result.ModuleForTests("foo"+sdkXmlFileSuffix, "android_common") result.ModuleForTests("foo"+sdkXmlFileSuffix, "android_common")
result.ModuleForTests("foo.api.public.28", "") result.ModuleForTests("foo.api.public.28", "")
result.ModuleForTests("foo.api.system.28", "") result.ModuleForTests("foo.api.system.28", "")