diff --git a/android/config.go b/android/config.go index 5c4f0a855..cd24b24ed 100644 --- a/android/config.go +++ b/android/config.go @@ -1024,7 +1024,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 { diff --git a/android/variable.go b/android/variable.go index c58867201..af1d9db0f 100644 --- a/android/variable.go +++ b/android/variable.go @@ -123,6 +123,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"` } @@ -242,7 +247,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"` diff --git a/apex/vndk_test.go b/apex/vndk_test.go index 391072ec8..dd08f0342 100644 --- a/apex/vndk_test.go +++ b/apex/vndk_test.go @@ -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")