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

Commit d80cbca7 authored by Colin Cross's avatar Colin Cross
Browse files

Convert cc to AndroidMkEntries 

Use AndroidMkEntries so the next patch can use ExtraFooters, which
doesn't exist in AndroidMkData.

Test: manually diff out/soong/Android.aosp_x86_64.mk
Change-Id: Ia3006b6747813693cf7e2b536030b21f3109f538
parent 077f9a44

cc/androidmk.go

+209 −192

File changed.

Preview size limit exceeded, changes collapsed.

cc/sanitize.go

+5 −5
Original line number Diff line number Diff line
@@ -609,18 +609,18 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
	return flags

}



func (sanitize *sanitize) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) {

func (sanitize *sanitize) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) {

	// Add a suffix for cfi/hwasan/scs-enabled static/header libraries to allow surfacing

	// both the sanitized and non-sanitized variants to make without a name conflict.

	if ret.Class == "STATIC_LIBRARIES" || ret.Class == "HEADER_LIBRARIES" {

	if entries.Class == "STATIC_LIBRARIES" || entries.Class == "HEADER_LIBRARIES" {

		if Bool(sanitize.Properties.Sanitize.Cfi) {

			ret.SubName += ".cfi"

			entries.SubName += ".cfi"

		}

		if Bool(sanitize.Properties.Sanitize.Hwaddress) {

			ret.SubName += ".hwasan"

			entries.SubName += ".hwasan"

		}

		if Bool(sanitize.Properties.Sanitize.Scs) {

			ret.SubName += ".scs"

			entries.SubName += ".scs"

		}

	}

}