Merge "Add native_coverage to product variables" (86ef38cf) · Commits · e / os / android_build_soong

android/config.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1029,7 +1029,7 @@ func (c *deviceConfig) DeviceKernelHeaderDirs() []string {
		}

		func (c *deviceConfig) NativeCoverageEnabled() bool {
		return Bool(c.config.productVariables.NativeCoverage)
		return Bool(c.config.productVariables.Native_coverage)
		}

		func (c *deviceConfig) ClangCoverageEnabled() bool {

+6 −1

Original line number	Diff line number	Diff line
		@@ -125,6 +125,11 @@ type variableProperties struct {
		Experimental_mte struct {
		Cflags []string `android:"arch_variant"`
		} `android:"arch_variant"`

		Native_coverage struct {
		Srcs []string `android:"arch_variant"`
		Exclude_srcs []string `android:"arch_variant"`
		} `android:"arch_variant"`
		} `android:"arch_variant"`
		}

		@@ -247,7 +252,7 @@ type productVariables struct {
		ClangTidy *bool `json:",omitempty"`
		TidyChecks *string `json:",omitempty"`

		NativeCoverage *bool `json:",omitempty"`
		Native_coverage *bool `json:",omitempty"`
		ClangCoverage *bool `json:",omitempty"`
		CoveragePaths []string `json:",omitempty"`
		CoverageExcludePaths []string `json:",omitempty"`

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ func TestVndkApexUsesVendorVariant(t *testing.T) {
		notice: "custom_notice",
		}
		`, func(fs map[string][]byte, config android.Config) {
		config.TestProductVariables.NativeCoverage = proptools.BoolPtr(true)
		config.TestProductVariables.Native_coverage = proptools.BoolPtr(true)
		})

		files := getFiles(t, ctx, "myapex", "android_common_image")