Merge "Use relocation-packer style relocation packing between 23 and 28." am: 730573cfc4 am: 6bae66aa74

Change-Id: I4cbf51d7a50365be96dc692f6d4955245b219fca
2020-01-30 18:06:04 +00:00
parent 54df290daa 6bae66aa74
commit 11631c65bb
1 changed files with 2 additions and 0 deletions
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -367,6 +367,8 @@ func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
 				flags.Global.LdFlags = append(flags.Global.LdFlags,
 					"-Wl,--pack-dyn-relocs=android+relr",
 					"-Wl,--use-android-relr-tags")
+			} else if CheckSdkVersionAtLeast(ctx, 23) {
+				flags.Global.LdFlags = append(flags.Global.LdFlags, "-Wl,--pack-dyn-relocs=android")
 			}
 		}
 	} else {