diff options
| author | 2020-01-31 03:12:22 +0000 | |
|---|---|---|
| committer | 2020-01-31 03:12:22 +0000 | |
| commit | 86ef38cfbf5046d24c437cbbc5e26e83776fa155 (patch) | |
| tree | 0f05440cd0406b075a771e957c5a1c63727902a2 | |
| parent | 29fd971526d8ea8a2d76459d4d40be9ffc5fefaa (diff) | |
| parent | d9a121ba2af293509873f3b8b22b63f93f51a6d6 (diff) | |
Merge "Add native_coverage to product variables"
| -rw-r--r-- | android/config.go | 2 | ||||
| -rw-r--r-- | android/variable.go | 7 | ||||
| -rw-r--r-- | apex/vndk_test.go | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/android/config.go b/android/config.go index 3dae6e272..da4f8e28e 100644 --- a/android/config.go +++ b/android/config.go @@ -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 { diff --git a/android/variable.go b/android/variable.go index 51306ad4e..c277acc48 100644 --- a/android/variable.go +++ b/android/variable.go @@ -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"` 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") |