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

Commit 0573b316 authored by Luke Huang's avatar Luke Huang
Browse files

Fix the apex compatible issue on the platform Q 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1710971

Bug: 187907243
Change-Id: If81c03e8d828cb9e421e48d887b06d5e7ab37d5f
(cherry picked from commit 0c96eb74)
Merged-In: I9aceb7ba33baa23d193a6d554e7892a5d5f0effa
parent 796421bd

cc/linker.go

+2 −2
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ func CheckSdkVersionAtLeast(ctx ModuleContext, SdkVersion android.ApiLevel) bool 
	if ctx.minSdkVersion() == "current" {

		return true

	}

	parsedSdkVersion, err := android.ApiLevelFromUser(ctx, ctx.minSdkVersion())

	parsedSdkVersion, err := nativeApiLevelFromUser(ctx, ctx.minSdkVersion())

	if err != nil {

		ctx.PropertyErrorf("min_sdk_version",

			"Invalid min_sdk_version value (must be int or current): %q",
@@ -424,7 +424,7 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags { 
			// ANDROID_RELR relocations were supported at API level >= 28.

			// Relocation packer was supported at API level >= 23.

			// Do the best we can...

			if !ctx.useSdk() || CheckSdkVersionAtLeast(ctx, android.FirstShtRelrVersion) {

			if (!ctx.useSdk() && ctx.minSdkVersion() == "") || CheckSdkVersionAtLeast(ctx, android.FirstShtRelrVersion) {

				flags.Global.LdFlags = append(flags.Global.LdFlags, "-Wl,--pack-dyn-relocs=android+relr")

			} else if CheckSdkVersionAtLeast(ctx, android.FirstAndroidRelrVersion) {

				flags.Global.LdFlags = append(flags.Global.LdFlags,