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

Commit 6caa9150 authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "Add handling for libc_hwasan to Soong" am: 7de9aa1a am: a330922e... 

Merge "Add handling for libc_hwasan to Soong" am: 7de9aa1a am: a330922e am: 61d9f8ed am: 11056ff6

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



Change-Id: I15f6f36601ab1eedb0a9f4234db2d5daabd7db6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee25a89f 11056ff6

apex/apex.go

+4 −1
Original line number Diff line number Diff line
@@ -1659,7 +1659,6 @@ func apexFileForNativeLibrary(ctx android.BaseModuleContext, ccMod *cc.Module, h 
	if ccMod.Target().NativeBridge == android.NativeBridgeEnabled {

		dirInApex = filepath.Join(dirInApex, ccMod.Target().NativeBridgeRelativePath)

	}

	dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath())

	if handleSpecialLibs && cc.InstallToBootstrap(ccMod.BaseModuleName(), ctx.Config()) {

		// Special case for Bionic libs and other libs installed with them. This is to

		// prevent those libs from being included in the search path
@@ -1672,6 +1671,10 @@ func apexFileForNativeLibrary(ctx android.BaseModuleContext, ccMod *cc.Module, h 
		// loading of them, which isn't supported.

		dirInApex = filepath.Join(dirInApex, "bionic")

	}

	// This needs to go after the runtime APEX handling because otherwise we would get

	// weird paths like lib64/rel_install_path/bionic rather than

	// lib64/bionic/rel_install_path.

	dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath())



	fileToCopy := android.OutputFileForModule(ctx, ccMod, "")

	androidMkModuleName := ccMod.BaseModuleName() + ccMod.Properties.SubName

cc/cc.go

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ func isBionic(name string) bool { 
func InstallToBootstrap(name string, config android.Config) bool {

	// NOTE: also update //build/bazel/rules/apex/cc.bzl#_installed_to_bootstrap

	// if this list is updated.

	if name == "libclang_rt.hwasan" {

	if name == "libclang_rt.hwasan" || name == "libc_hwasan" {

		return true

	}

	return isBionic(name)

cc/library.go

+10 −1
Original line number Diff line number Diff line
@@ -2207,7 +2207,16 @@ func (library *libraryDecorator) toc() android.OptionalPath { 
func (library *libraryDecorator) installSymlinkToRuntimeApex(ctx ModuleContext, file android.Path) {

	dir := library.baseInstaller.installDir(ctx)

	dirOnDevice := android.InstallPathToOnDevicePath(ctx, dir)

	target := "/" + filepath.Join("apex", "com.android.runtime", dir.Base(), "bionic", file.Base())

	// libc_hwasan has relative_install_dir set, which would mess up the dir.Base() logic.

	// hardcode here because it's the only target, if we have other targets that use this

	// we can generalise this.

	var target string

	if ctx.baseModuleName() == "libc_hwasan" {

		target = "/" + filepath.Join("apex", "com.android.runtime", "lib64", "bionic", "hwasan", file.Base())

	} else {

		base := dir.Base()

		target = "/" + filepath.Join("apex", "com.android.runtime", base, "bionic", file.Base())

	}

	ctx.InstallAbsoluteSymlink(dir, file.Base(), target)

	library.postInstallCmds = append(library.postInstallCmds, makeSymlinkCmd(dirOnDevice, file.Base(), target))

}

cc/sanitize.go

+7 −0
Original line number Diff line number Diff line
@@ -792,6 +792,13 @@ func (s *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
		if Bool(sanProps.Writeonly) {

			flags.Local.CFlags = append(flags.Local.CFlags, "-mllvm", "-hwasan-instrument-reads=0")

		}

		if !ctx.staticBinary() && !ctx.Host() {

			if ctx.bootstrap() {

				flags.DynamicLinker = "/system/bin/bootstrap/linker_hwasan64"

			} else {

				flags.DynamicLinker = "/system/bin/linker_hwasan64"

			}

		}

	}



	if Bool(sanProps.Fuzzer) {