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

Commit 79268427 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

Merge "Add sanitizer runtime library to recovery when needed." 

am: 5b46a085

Change-Id: I7115159d4bd3eb88636699c4164fabe07501554f
parents e7494143 5b46a085

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

		}

	}