Add apex stub lib to LOCAL_SHARED_LIBRARIES
This commit removes a break statement so that apex stub libraries are added to LOCAL_SHARED_LIBRARIES for prebuilt ABI checker. This CL doesn't change I09b78e38df285033ef6e9c85f7ea4b0274e85070 [1]. The libraries provided by apex modules are not installed to `/system/lib[64]` because their stub libraries have `LOCAL_UNINSTALLABLE_MODULE := true`. [1] https://android-review.googlesource.com/844555 Bug: 120266448 Bug: 119084334 Test: Add `stubs: { symbol_file: "libnetd_resolv.map.txt", versions: ["1"]}` to libnetd_resolv, create a program that depends on `libnetd_resolve`, build the program, and do not find `/system/lib/libnetd_resolv.so`. Change-Id: Iffa2c1a0eac9c4940ec1fa05fbacb9806272c31e
This commit is contained in:
parent
77542038eb
commit
09106e182e
5
cc/cc.go
5
cc/cc.go
|
@ -1652,17 +1652,14 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
|||
// Export the shared libs to Make.
|
||||
switch depTag {
|
||||
case sharedDepTag, sharedExportDepTag, lateSharedDepTag:
|
||||
// Dependency to the stubs lib which is already included in an APEX
|
||||
// is not added to the androidmk dependency
|
||||
if dependentLibrary, ok := ccDep.linker.(*libraryDecorator); ok {
|
||||
if dependentLibrary.buildStubs() && android.InAnyApex(depName) {
|
||||
// Also add the dependency to the APEX(es) providing the library so that
|
||||
// Add the dependency to the APEX(es) providing the library so that
|
||||
// m <module> can trigger building the APEXes as well.
|
||||
for _, an := range android.GetApexesForModule(depName) {
|
||||
c.Properties.ApexesProvidingSharedLibs = append(
|
||||
c.Properties.ApexesProvidingSharedLibs, an)
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue