openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add linkerconfig to Runtime APEX"

This commit is contained in:
Kiyoung Kim 2020-12-04 01:00:22 +00:00 committed by Gerrit Code Review
parent cf8b2ee16e 4098c7eddf
commit 2ba87f466c
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@ -2016,7 +2016,9 @@ func (a *apexBundle) checkStaticLinkingToStubLibraries(ctx android.ModuleContext
// The dynamic linker and crash_dump tool in the runtime APEX is the only // 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 // exception to this rule. It can't make the static dependencies dynamic
// because it can't do the dynamic linking for itself. // 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 return false
} }

2
cc/cc.go
View File

@ -1128,7 +1128,7 @@ func (c *Module) ExcludeFromRecoverySnapshot() bool {
func isBionic(name string) bool { func isBionic(name string) bool {
switch name { switch name {
case "libc", "libm", "libdl", "libdl_android", "linker": case "libc", "libm", "libdl", "libdl_android", "linker", "linkerconfig":
return true return true
} }
return false return false

4
linkerconfig/proto/Android.bp
View File

@ -7,6 +7,10 @@ cc_library_static {
type: "lite", type: "lite",
}, },
srcs: ["linker_config.proto"], srcs: ["linker_config.proto"],
apex_available: [
"//apex_available:platform",
"//apex_available:anyapex",
],
} }
python_library_host { python_library_host {