Merge "Remove AfdoAdditionalProfileDirs product variable"
This commit is contained in:
commit
59834cc56d
3 changed files with 2 additions and 7 deletions
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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"`
|
||||
|
|
|
@ -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
|
||||
})
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue