diff --git a/java/sdk_library.go b/java/sdk_library.go index 78ac76094..e6cb6c49b 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -118,9 +118,6 @@ type apiScope struct { // The tag to use to depend on the stubs source module (if separate from the API module). 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. stubsSourceAndApiTag scopeDependencyTag @@ -195,11 +192,6 @@ func initApiScope(scope *apiScope) *apiScope { apiScope: scope, depInfoExtractor: (*scopePaths).extractStubsSourceInfoFromDep, } - scope.apiFileTag = scopeDependencyTag{ - name: name + "-api", - apiScope: scope, - depInfoExtractor: (*scopePaths).extractApiInfoFromDep, - } scope.stubsSourceAndApiTag = scopeDependencyTag{ name: name + "-stubs-source-and-api", apiScope: scope, @@ -804,12 +796,6 @@ func (paths *scopePaths) extractApiInfoFromApiStubsProvider(provider ApiStubsPro 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 { stubsSrcJar, err := provider.StubsSrcJar(stubsType) if err == nil {