Add linkerconfig to Runtime APEX
Add linkerconfig to Runtime APEX module. Bug: 165769179 Test: Cuttlefish boot succeeded Change-Id: I31c4bfa2ce88b64d7100f227ec289416db253b13
This commit is contained in:
parent
e76ec1cbeb
commit
4098c7eddf
|
@ -2013,7 +2013,9 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext
|
|||
// The dynamic linker and crash_dump tool in the runtime APEX is the only
|
||||
// exception to this rule. It can't make the static dependencies dynamic
|
||||
// because it can't do the dynamic linking for itself.
|
||||
if apexName == "com.android.runtime" && (fromName == "linker" || fromName == "crash_dump") {
|
||||
// Same rule should be applied to linkerconfig, because it should be executed
|
||||
// only with static linked libraries before linker is available with ld.config.txt
|
||||
if apexName == "com.android.runtime" && (fromName == "linker" || fromName == "crash_dump" || fromName == "linkerconfig") {
|
||||
return false
|
||||
}
|
||||
|
||||
|
|
2
cc/cc.go
2
cc/cc.go
|
@ -1074,7 +1074,7 @@ func (c *Module) ExcludeFromRecoverySnapshot() bool {
|
|||
|
||||
func isBionic(name string) bool {
|
||||
switch name {
|
||||
case "libc", "libm", "libdl", "libdl_android", "linker":
|
||||
case "libc", "libm", "libdl", "libdl_android", "linker", "linkerconfig":
|
||||
return true
|
||||
}
|
||||
return false
|
||||
|
|
|
@ -7,6 +7,10 @@ cc_library_static {
|
|||
type: "lite",
|
||||
},
|
||||
srcs: ["linker_config.proto"],
|
||||
apex_available: [
|
||||
"//apex_available:platform",
|
||||
"//apex_available:anyapex",
|
||||
],
|
||||
}
|
||||
|
||||
python_library_host {
|
||||
|
|
Loading…
Reference in New Issue