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

Commit 6ef7afc9 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Export sanitizer paths to Make" am: 2e917869 

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

Change-Id: I8b27dbcaedded11cc053aa13653241c14c3519ab
parents 6be81464 2e917869

cc/makevars.go

+37 −8
Original line number Diff line number Diff line
@@ -255,14 +255,43 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, 
	}, " "))



	if target.Os.Class == android.Device {

		ctx.Strict(secondPrefix+"ADDRESS_SANITIZER_RUNTIME_LIBRARY", strings.TrimSuffix(config.AddressSanitizerRuntimeLibrary(toolchain), ".so"))

		ctx.Strict(secondPrefix+"HWADDRESS_SANITIZER_RUNTIME_LIBRARY", strings.TrimSuffix(config.HWAddressSanitizerRuntimeLibrary(toolchain), ".so"))

		ctx.Strict(secondPrefix+"HWADDRESS_SANITIZER_STATIC_LIBRARY", strings.TrimSuffix(config.HWAddressSanitizerStaticLibrary(toolchain), ".a"))

		ctx.Strict(secondPrefix+"UBSAN_RUNTIME_LIBRARY", strings.TrimSuffix(config.UndefinedBehaviorSanitizerRuntimeLibrary(toolchain), ".so"))

		ctx.Strict(secondPrefix+"UBSAN_MINIMAL_RUNTIME_LIBRARY", strings.TrimSuffix(config.UndefinedBehaviorSanitizerMinimalRuntimeLibrary(toolchain), ".a"))

		ctx.Strict(secondPrefix+"TSAN_RUNTIME_LIBRARY", strings.TrimSuffix(config.ThreadSanitizerRuntimeLibrary(toolchain), ".so"))

		ctx.Strict(secondPrefix+"SCUDO_RUNTIME_LIBRARY", strings.TrimSuffix(config.ScudoRuntimeLibrary(toolchain), ".so"))

		ctx.Strict(secondPrefix+"SCUDO_MINIMAL_RUNTIME_LIBRARY", strings.TrimSuffix(config.ScudoMinimalRuntimeLibrary(toolchain), ".so"))

		sanitizerVariables := map[string]string{

			"ADDRESS_SANITIZER_RUNTIME_LIBRARY":   config.AddressSanitizerRuntimeLibrary(toolchain),

			"HWADDRESS_SANITIZER_RUNTIME_LIBRARY": config.HWAddressSanitizerRuntimeLibrary(toolchain),

			"HWADDRESS_SANITIZER_STATIC_LIBRARY":  config.HWAddressSanitizerStaticLibrary(toolchain),

			"UBSAN_RUNTIME_LIBRARY":               config.UndefinedBehaviorSanitizerRuntimeLibrary(toolchain),

			"UBSAN_MINIMAL_RUNTIME_LIBRARY":       config.UndefinedBehaviorSanitizerMinimalRuntimeLibrary(toolchain),

			"TSAN_RUNTIME_LIBRARY":                config.ThreadSanitizerRuntimeLibrary(toolchain),

			"SCUDO_RUNTIME_LIBRARY":               config.ScudoRuntimeLibrary(toolchain),

			"SCUDO_MINIMAL_RUNTIME_LIBRARY":       config.ScudoMinimalRuntimeLibrary(toolchain),

		}



		for variable, value := range sanitizerVariables {

			ctx.Strict(secondPrefix+variable, value)

		}



		sanitizerLibs := android.SortedStringValues(sanitizerVariables)

		var sanitizerLibStems []string

		ctx.VisitAllModules(func(m android.Module) {

			if !m.Enabled() {

				return

			}



			ccModule, _ := m.(*Module)

			if ccModule == nil || ccModule.library == nil || !ccModule.library.shared() {

				return

			}



			if android.InList(strings.TrimPrefix(ctx.ModuleName(m), "prebuilt_"), sanitizerLibs) &&

				m.Target().Os == target.Os && m.Target().Arch.ArchType == target.Arch.ArchType {

				outputFile := ccModule.outputFile

				if outputFile.Valid() {

					sanitizerLibStems = append(sanitizerLibStems, outputFile.Path().Base())

				}

			}

		})

		sanitizerLibStems = android.SortedUniqueStrings(sanitizerLibStems)

		ctx.Strict(secondPrefix+"SANITIZER_STEMS", strings.Join(sanitizerLibStems, " "))

	}



	// This is used by external/gentoo/...