Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ba87f46 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Gerrit Code Review
Browse files

Merge "Add linkerconfig to Runtime APEX"

parents cf8b2ee1 4098c7ed

apex/apex.go

+3 −1
Original line number Diff line number Diff line
@@ -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

			// 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

			}

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,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

linkerconfig/proto/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ cc_library_static { 
        type: "lite",

    },

    srcs: ["linker_config.proto"],

    apex_available: [

        "//apex_available:platform",

        "//apex_available:anyapex",

    ],

}



python_library_host {