diff --git a/android/config.go b/android/config.go index 0c3e2d1f1..1deb7d4ae 100644 --- a/android/config.go +++ b/android/config.go @@ -1272,10 +1272,6 @@ func (c *deviceConfig) NativeCoverageEnabledForPath(path string) bool { return coverage } -func (c *deviceConfig) AfdoAdditionalProfileDirs() []string { - return c.config.productVariables.AfdoAdditionalProfileDirs -} - func (c *deviceConfig) PgoAdditionalProfileDirs() []string { return c.config.productVariables.PgoAdditionalProfileDirs } diff --git a/android/variable.go b/android/variable.go index 37ecab51d..28f22c9b3 100644 --- a/android/variable.go +++ b/android/variable.go @@ -336,8 +336,7 @@ type productVariables struct { NamespacesToExport []string `json:",omitempty"` - AfdoAdditionalProfileDirs []string `json:",omitempty"` - PgoAdditionalProfileDirs []string `json:",omitempty"` + PgoAdditionalProfileDirs []string `json:",omitempty"` VndkUseCoreVariant *bool `json:",omitempty"` VndkSnapshotBuildArtifacts *bool `json:",omitempty"` diff --git a/cc/afdo.go b/cc/afdo.go index fb66bbe52..d36f4afcf 100644 --- a/cc/afdo.go +++ b/cc/afdo.go @@ -36,7 +36,7 @@ const afdoCFlagsFormat = "-funique-internal-linkage-names -fprofile-sample-accur func getAfdoProfileProjects(config android.DeviceConfig) []string { return config.OnceStringSlice(afdoProfileProjectsConfigKey, func() []string { - return append(globalAfdoProfileProjects, config.AfdoAdditionalProfileDirs()...) + return globalAfdoProfileProjects }) }