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

Commit 98f5b064 authored by Evgenii Stepanov's avatar Evgenii Stepanov
Browse files

Add sanitizer runtime library to recovery when needed. 

Make sanitized targets in recovery depend on ".recovery" flavor of
sanitizer runtime library. This forces installation of the runtime
library in recovery image as long as at least one target depends on it.

Test: hwasan build can boot into recovery
Bug: 112438058
Bug: 119582521
Change-Id: I1b7f9fa4ff5f29acb03c27074512ea24467a3d37
parent 42f19a79

cc/sanitize.go

+5 −2
Original line number Diff line number Diff line
@@ -576,9 +576,12 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
		sanitize.runtimeLibrary = runtimeLibrary



		// When linking against VNDK, use the vendor variant of the runtime lib

		sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary

		if ctx.useVndk() {

			sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary + vendorSuffix

		} else if ctx.inRecovery() {

			sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary + recoverySuffix

		} else {

			sanitize.androidMkRuntimeLibrary = sanitize.runtimeLibrary

		}

	}