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

Commit 49932f3e authored by Jiyong Park's avatar Jiyong Park
Browse files

Build native coverage variant of APEXes when needed 

When the native coverage is enabled, APEXes (and files there) are built
for native coverage as well.

Bug: 138952487
Test: make -j NATIVE_COVERAGE=true COVERAGE_PATHS='*' com.android.resolv
find out -name "*.gcno" | grep DnsResolver shows files

Test: libnetd_resolv.zip is found under
$(TARGET_OUT)/apex/com.android.resolv/lib directory

Merged-In: I97bcee9bf8ffc0dc71453abbdb613ed56ea2cdb4
(cherry picked from commit ee9a98d8)
Change-Id: I97bcee9bf8ffc0dc71453abbdb613ed56ea2cdb4
parent 1bc40c56

apex/apex.go

+29 −3
Original line number Diff line number Diff line
@@ -266,6 +266,10 @@ type apexBundleProperties struct { 


	// List of sanitizer names that this APEX is enabled for

	SanitizerNames []string `blueprint:"mutated"`



	PreventInstall bool `blueprint:"mutated"`



	HideFromMake bool `blueprint:"mutated"`

}



type apexTargetBundleProperties struct {
@@ -548,7 +552,7 @@ func (a *apexBundle) Srcs() android.Paths { 
}



func (a *apexBundle) installable() bool {

	return a.properties.Installable == nil || proptools.Bool(a.properties.Installable)

	return !a.properties.PreventInstall && (a.properties.Installable == nil || proptools.Bool(a.properties.Installable))

}



func (a *apexBundle) getImageVariation(config android.DeviceConfig) string {
@@ -583,6 +587,18 @@ func (a *apexBundle) IsSanitizerEnabled(ctx android.BaseModuleContext, sanitizer 
	return android.InList(sanitizerName, globalSanitizerNames)

}



func (a *apexBundle) IsNativeCoverageNeeded(ctx android.BaseContext) bool {

	return ctx.Device() && ctx.DeviceConfig().NativeCoverageEnabled()

}



func (a *apexBundle) PreventInstall() {

	a.properties.PreventInstall = true

}



func (a *apexBundle) HideFromMake() {

	a.properties.HideFromMake = true

}



func getCopyManifestForNativeLibrary(cc *cc.Module, handleSpecialLibs bool) (fileToCopy android.Path, dirInApex string) {

	// Decide the APEX-local directory by the multilib of the library

	// In the future, we may query this to the module.
@@ -1082,6 +1098,11 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) { 
}



func (a *apexBundle) AndroidMk() android.AndroidMkData {

	if a.properties.HideFromMake {

		return android.AndroidMkData{

			Disabled: true,

		}

	}

	writers := []android.AndroidMkData{}

	if a.apexTypes.image() {

		writers = append(writers, a.androidMkForType(imageApex))
@@ -1171,9 +1192,14 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string, apex 
			fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_java_prebuilt.mk")

		} else if fi.class == nativeSharedLib || fi.class == nativeExecutable {

			fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base())

			if cc, ok := fi.module.(*cc.Module); ok && cc.UnstrippedOutputFile() != nil {

			if cc, ok := fi.module.(*cc.Module); ok {

				if cc.UnstrippedOutputFile() != nil {

					fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", cc.UnstrippedOutputFile().String())

				}

				if cc.CoverageOutputFile().Valid() {

					fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", cc.CoverageOutputFile().String())

				}

			}

			fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_prebuilt.mk")

		} else {

			fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base())

cc/binary.go

+4 −0
Original line number Diff line number Diff line
@@ -421,6 +421,10 @@ func (binary *binaryDecorator) nativeCoverage() bool { 
	return true

}



func (binary *binaryDecorator) coverageOutputFilePath() android.OptionalPath {

	return binary.coverageOutputFile

}



// /system/bin/linker -> /apex/com.android.runtime/bin/linker

func (binary *binaryDecorator) installSymlinkToRuntimeApex(ctx ModuleContext, file android.Path) {

	dir := binary.baseInstaller.installDir(ctx)

cc/cc.go

+8 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ type linker interface { 
	unstrippedOutputFilePath() android.Path



	nativeCoverage() bool

	coverageOutputFilePath() android.OptionalPath

}



type installer interface {
@@ -419,6 +420,13 @@ func (c *Module) UnstrippedOutputFile() android.Path { 
	return nil

}



func (c *Module) CoverageOutputFile() android.OptionalPath {

	if c.linker != nil {

		return c.linker.coverageOutputFilePath()

	}

	return android.OptionalPath{}

}



func (c *Module) RelativeInstallPath() string {

	if c.installer != nil {

		return c.installer.relativeInstallPath()

cc/coverage.go

+17 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ func (cov *coverage) begin(ctx BaseModuleContext) { 
	} else {

		// Check if Native_coverage is set to false.  This property defaults to true.

		needCoverageVariant = BoolDefault(cov.Properties.Native_coverage, true)



		if sdk_version := ctx.sdkVersion(); ctx.useSdk() && sdk_version != "current" {

			// Native coverage is not supported for SDK versions < 23

			if fromApi, err := strconv.Atoi(sdk_version); err == nil && fromApi < 23 {
@@ -156,6 +155,14 @@ func (cov *coverage) begin(ctx BaseModuleContext) { 
	cov.Properties.NeedCoverageVariant = needCoverageVariant

}



// Coverage is an interface for non-CC modules to implement to be mutated for coverage

type Coverage interface {

	android.Module

	IsNativeCoverageNeeded(ctx android.BaseModuleContext) bool

	PreventInstall()

	HideFromMake()

}



func coverageMutator(mctx android.BottomUpMutatorContext) {

	if c, ok := mctx.Module().(*Module); ok && c.coverage != nil {

		needCoverageVariant := c.coverage.Properties.NeedCoverageVariant
@@ -175,5 +182,14 @@ func coverageMutator(mctx android.BottomUpMutatorContext) { 
			m[1].(*Module).coverage.Properties.CoverageEnabled = needCoverageBuild

			m[1].(*Module).coverage.Properties.IsCoverageVariant = true

		}

	} else if cov, ok := mctx.Module().(Coverage); ok && cov.IsNativeCoverageNeeded(mctx) {

		// APEX modules fall here



		// Note: variant "" is also created because an APEX can be depended on by another

		// module which are split into "" and "cov" variants. e.g. when cc_test refers

		// to an APEX via 'data' property.

		m := mctx.CreateVariations("", "cov")

		m[0].(Coverage).PreventInstall()

		m[0].(Coverage).HideFromMake()

	}

}

cc/library.go

+4 −0
Original line number Diff line number Diff line
@@ -758,6 +758,10 @@ func (library *libraryDecorator) nativeCoverage() bool { 
	return true

}



func (library *libraryDecorator) coverageOutputFilePath() android.OptionalPath {

	return library.coverageOutputFile

}



func getRefAbiDumpFile(ctx ModuleContext, vndkVersion, fileName string) android.Path {

	isLlndk := inList(ctx.baseModuleName(), llndkLibraries) || inList(ctx.baseModuleName(), ndkMigratedLibs)