diff options
| author | 2023-04-04 22:04:43 +0000 | |
|---|---|---|
| committer | 2023-04-04 22:52:37 +0000 | |
| commit | c0a24205a78b78c0b0d888f2167732ae923c6634 (patch) | |
| tree | 92b4c640ecf2d5956fb6e8213c9228d11b30344e /java/java.go | |
| parent | f590058fd2e87331dd701703763beba158d0929c (diff) | |
Update java_api_library in testing modules
The full api surface java_api_library modules are currently defined as
java_library modules instead of java_api_library modules. This change
corrects this and modifies the DepsInfo of java_api_library so that it
can be compatible in tests.
Test: go ./java
Change-Id: I540b5a930f506ce5f7663ab6e07c6df49af15cf9
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 97d55146c..c97f42740 100644 --- a/java/java.go +++ b/java/java.go @@ -1612,7 +1612,7 @@ func (ap *JavaApiContribution) GenerateAndroidBuildActions(ctx android.ModuleCon } type JavaApiLibraryDepsInfo struct { - StubsJar android.Path + JavaInfo StubsSrcJar android.Path } @@ -1821,7 +1821,7 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { staticLibs = append(staticLibs, provider.HeaderJars...) case depApiSrcsTag: provider := ctx.OtherModuleProvider(dep, JavaApiLibraryDepsProvider).(JavaApiLibraryDepsInfo) - classPaths = append(classPaths, provider.StubsJar) + classPaths = append(classPaths, provider.HeaderJars...) depApiSrcsStubsSrcJar = provider.StubsSrcJar } }) @@ -1900,7 +1900,9 @@ func (al *ApiLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) { }) ctx.SetProvider(JavaApiLibraryDepsProvider, JavaApiLibraryDepsInfo{ - StubsJar: al.stubsJar, + JavaInfo: JavaInfo{ + HeaderJars: android.PathsIfNonNil(al.stubsJar), + }, StubsSrcJar: al.stubsSrcJar, }) } |