Remove the unused apiFileTag
This change removes the unused `apiScope.apiFileTag` and its `depInfoExtractor` function. Test: m nothing --no-skip-soong-tests Change-Id: I640bee3a188be03742559e31ce4fbc4475dbd3ba
This commit is contained in:
@@ -118,9 +118,6 @@ type apiScope struct {
|
|||||||
// The tag to use to depend on the stubs source module (if separate from the API module).
|
// The tag to use to depend on the stubs source module (if separate from the API module).
|
||||||
stubsSourceTag scopeDependencyTag
|
stubsSourceTag scopeDependencyTag
|
||||||
|
|
||||||
// The tag to use to depend on the API file generating module (if separate from the stubs source module).
|
|
||||||
apiFileTag scopeDependencyTag
|
|
||||||
|
|
||||||
// The tag to use to depend on the stubs source and API module.
|
// The tag to use to depend on the stubs source and API module.
|
||||||
stubsSourceAndApiTag scopeDependencyTag
|
stubsSourceAndApiTag scopeDependencyTag
|
||||||
|
|
||||||
@@ -195,11 +192,6 @@ func initApiScope(scope *apiScope) *apiScope {
|
|||||||
apiScope: scope,
|
apiScope: scope,
|
||||||
depInfoExtractor: (*scopePaths).extractStubsSourceInfoFromDep,
|
depInfoExtractor: (*scopePaths).extractStubsSourceInfoFromDep,
|
||||||
}
|
}
|
||||||
scope.apiFileTag = scopeDependencyTag{
|
|
||||||
name: name + "-api",
|
|
||||||
apiScope: scope,
|
|
||||||
depInfoExtractor: (*scopePaths).extractApiInfoFromDep,
|
|
||||||
}
|
|
||||||
scope.stubsSourceAndApiTag = scopeDependencyTag{
|
scope.stubsSourceAndApiTag = scopeDependencyTag{
|
||||||
name: name + "-stubs-source-and-api",
|
name: name + "-stubs-source-and-api",
|
||||||
apiScope: scope,
|
apiScope: scope,
|
||||||
@@ -804,12 +796,6 @@ func (paths *scopePaths) extractApiInfoFromApiStubsProvider(provider ApiStubsPro
|
|||||||
return combinedError
|
return combinedError
|
||||||
}
|
}
|
||||||
|
|
||||||
func (paths *scopePaths) extractApiInfoFromDep(ctx android.ModuleContext, dep android.Module) error {
|
|
||||||
return paths.treatDepAsApiStubsProvider(dep, func(provider ApiStubsProvider) error {
|
|
||||||
return paths.extractApiInfoFromApiStubsProvider(provider, Everything)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (paths *scopePaths) extractStubsSourceInfoFromApiStubsProviders(provider ApiStubsSrcProvider, stubsType StubsType) error {
|
func (paths *scopePaths) extractStubsSourceInfoFromApiStubsProviders(provider ApiStubsSrcProvider, stubsType StubsType) error {
|
||||||
stubsSrcJar, err := provider.StubsSrcJar(stubsType)
|
stubsSrcJar, err := provider.StubsSrcJar(stubsType)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
|
Reference in New Issue
Block a user