diff options
| -rw-r--r-- | apex/apex.go | 4 | ||||
| -rw-r--r-- | cc/cc.go | 2 | ||||
| -rw-r--r-- | linkerconfig/proto/Android.bp | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/apex/apex.go b/apex/apex.go index f127757b3..f8fb3550c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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 } @@ -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 diff --git a/linkerconfig/proto/Android.bp b/linkerconfig/proto/Android.bp index c04887e9b..4d971288d 100644 --- a/linkerconfig/proto/Android.bp +++ b/linkerconfig/proto/Android.bp @@ -7,6 +7,10 @@ cc_library_static { type: "lite", }, srcs: ["linker_config.proto"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], } python_library_host { |