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

Merge "Stop sdk_library generated api_library to depend on full surface api_library" into main am: f5ee8e3ffc am: b880908c09 am: 740c5a4011 am: 0454473c23 am: d0b1fdbc26

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2674197

Change-Id: Ib790eeecaf2dd39badbdc5c7dc16da5145ecbbcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-15 23:38:47 +00:00
committed by Automerger Merge Worker
parent 4fac9ea8b2 d0b1fdbc26
commit 0cc296c9bc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/sdk_library.go
View File

@@ -1859,7 +1859,7 @@ func (module *SdkLibrary) createApiLibrary(mctx android.DefaultableHookContext,
props.Libs = append(props.Libs, module.scopeToProperties[apiScope].Libs...)
props.Libs = append(props.Libs, "stub-annotations")
props.Static_libs = module.sdkLibraryProperties.Stub_only_static_libs
props.Full_api_surface_stub = proptools.StringPtr(apiScope.kind.DefaultJavaLibraryName() + ".from-text")
props.Full_api_surface_stub = proptools.StringPtr(apiScope.kind.DefaultJavaLibraryName())
if alternativeFullApiSurfaceStub != "" {
props.Full_api_surface_stub = proptools.StringPtr(alternativeFullApiSurfaceStub)
}