Merge changes from topic "soong_sanitize_fix" am: 8c69770ff0 (d044e845) · Commits · e / os / android_build_soong

cc/image.go

+27 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,33 @@ import (

		var _ android.ImageInterface = (*Module)(nil)

		type imageVariantType string

		const (
		coreImageVariant imageVariantType = "core"
		vendorImageVariant imageVariantType = "vendor"
		productImageVariant imageVariantType = "product"
		ramdiskImageVariant imageVariantType = "ramdisk"
		recoveryImageVariant imageVariantType = "recovery"
		hostImageVariant imageVariantType = "host"
		)

		func (c *Module) getImageVariantType() imageVariantType {
		if c.Host() {
		return hostImageVariant
		} else if c.inVendor() {
		return vendorImageVariant
		} else if c.inProduct() {
		return productImageVariant
		} else if c.InRamdisk() {
		return ramdiskImageVariant
		} else if c.InRecovery() {
		return recoveryImageVariant
		} else {
		return coreImageVariant
		}
		}

		const (
		// VendorVariationPrefix is the variant prefix used for /vendor code that compiles
		// against the VNDK.

cc/sanitize.go

+64 −40

Original line number	Diff line number	Diff line
		@@ -58,8 +58,6 @@ var (
		cfiLdflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fsanitize=cfi",
		"-Wl,-plugin-opt,O1"}
		cfiExportsMapPath = "build/soong/cc/config/cfi_exports.map"
		cfiStaticLibsMutex sync.Mutex
		hwasanStaticLibsMutex sync.Mutex

		intOverflowCflags = []string{"-fsanitize-blacklist=build/soong/cc/config/integer_overflow_blocklist.txt"}

		@@ -1050,15 +1048,9 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
		// Export the static lib name to make
		if c.static() && c.ExportedToMake() {
		if t == cfi {
		appendStringSync(c.Name(), cfiStaticLibs(mctx.Config()), &cfiStaticLibsMutex)
		cfiStaticLibs(mctx.Config()).add(c, c.Name())
		} else if t == hwasan {
		if c.UseVndk() {
		appendStringSync(c.Name(), hwasanVendorStaticLibs(mctx.Config()),
		&hwasanStaticLibsMutex)
		} else {
		appendStringSync(c.Name(), hwasanStaticLibs(mctx.Config()),
		&hwasanStaticLibsMutex)
		}
		hwasanStaticLibs(mctx.Config()).add(c, c.Name())
		}
		}
		} else {
		@@ -1088,34 +1080,74 @@ func sanitizerMutator(t sanitizerType) func(android.BottomUpMutatorContext) {
		}
		}

		var cfiStaticLibsKey = android.NewOnceKey("cfiStaticLibs")
		type sanitizerStaticLibsMap struct {
		// libsMap contains one list of modules per each image and each arch.
		// e.g. libs[vendor]["arm"] contains arm modules installed to vendor
		libsMap map[imageVariantType]map[string][]string
		libsMapLock sync.Mutex
		sanitizerType sanitizerType
		}

		func cfiStaticLibs(config android.Config) *[]string {
		return config.Once(cfiStaticLibsKey, func() interface{} {
		return &[]string{}
		}).(*[]string)
		func newSanitizerStaticLibsMap(t sanitizerType) *sanitizerStaticLibsMap {
		return &sanitizerStaticLibsMap{
		sanitizerType: t,
		libsMap: make(map[imageVariantType]map[string][]string),
		}
		}

		var hwasanStaticLibsKey = android.NewOnceKey("hwasanStaticLibs")
		// Add the current module to sanitizer static libs maps
		// Each module should pass its exported name as names of Make and Soong can differ.
		func (s sanitizerStaticLibsMap) add(c Module, name string) {
		image := c.getImageVariantType()
		arch := c.Arch().ArchType.String()

		func hwasanStaticLibs(config android.Config) *[]string {
		return config.Once(hwasanStaticLibsKey, func() interface{} {
		return &[]string{}
		}).(*[]string)
		s.libsMapLock.Lock()
		defer s.libsMapLock.Unlock()

		if _, ok := s.libsMap[image]; !ok {
		s.libsMap[image] = make(map[string][]string)
		}

		var hwasanVendorStaticLibsKey = android.NewOnceKey("hwasanVendorStaticLibs")
		s.libsMap[image][arch] = append(s.libsMap[image][arch], name)
		}

		// Exports makefile variables in the following format:
		// SOONG_{sanitizer}_{image}_{arch}_STATIC_LIBRARIES
		// e.g. SOONG_cfi_core_x86_STATIC_LIBRARIES
		// These are to be used by use_soong_sanitized_static_libraries.
		// See build/make/core/binary.mk for more details.
		func (s *sanitizerStaticLibsMap) exportToMake(ctx android.MakeVarsContext) {
		for _, image := range android.SortedStringKeys(s.libsMap) {
		archMap := s.libsMap[imageVariantType(image)]
		for _, arch := range android.SortedStringKeys(archMap) {
		libs := archMap[arch]
		sort.Strings(libs)

		key := fmt.Sprintf(
		"SOONG_%s_%s_%s_STATIC_LIBRARIES",
		s.sanitizerType.variationName(),
		image, // already upper
		arch)

		func hwasanVendorStaticLibs(config android.Config) *[]string {
		return config.Once(hwasanVendorStaticLibsKey, func() interface{} {
		return &[]string{}
		}).(*[]string)
		ctx.Strict(key, strings.Join(libs, " "))
		}
		}
		}

		var cfiStaticLibsKey = android.NewOnceKey("cfiStaticLibs")

		func appendStringSync(item string, list []string, mutex sync.Mutex) {
		mutex.Lock()
		list = append(list, item)
		mutex.Unlock()
		func cfiStaticLibs(config android.Config) *sanitizerStaticLibsMap {
		return config.Once(cfiStaticLibsKey, func() interface{} {
		return newSanitizerStaticLibsMap(cfi)
		}).(*sanitizerStaticLibsMap)
		}

		var hwasanStaticLibsKey = android.NewOnceKey("hwasanStaticLibs")

		func hwasanStaticLibs(config android.Config) *sanitizerStaticLibsMap {
		return config.Once(hwasanStaticLibsKey, func() interface{} {
		return newSanitizerStaticLibsMap(hwasan)
		}).(*sanitizerStaticLibsMap)
		}

		func enableMinimalRuntime(sanitize *sanitize) bool {
		@@ -1145,17 +1177,9 @@ func enableUbsanRuntime(sanitize *sanitize) bool {
		}

		func cfiMakeVarsProvider(ctx android.MakeVarsContext) {
		cfiStaticLibs := cfiStaticLibs(ctx.Config())
		sort.Strings(*cfiStaticLibs)
		ctx.Strict("SOONG_CFI_STATIC_LIBRARIES", strings.Join(*cfiStaticLibs, " "))
		cfiStaticLibs(ctx.Config()).exportToMake(ctx)
		}

		func hwasanMakeVarsProvider(ctx android.MakeVarsContext) {
		hwasanStaticLibs := hwasanStaticLibs(ctx.Config())
		sort.Strings(*hwasanStaticLibs)
		ctx.Strict("SOONG_HWASAN_STATIC_LIBRARIES", strings.Join(*hwasanStaticLibs, " "))

		hwasanVendorStaticLibs := hwasanVendorStaticLibs(ctx.Config())
		sort.Strings(*hwasanVendorStaticLibs)
		ctx.Strict("SOONG_HWASAN_VENDOR_STATIC_LIBRARIES", strings.Join(*hwasanVendorStaticLibs, " "))
		hwasanStaticLibs(ctx.Config()).exportToMake(ctx)
		}