StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove AfdoAdditionalProfileDirs product variable"

Browse Source
This commit is contained in:
Vinh Tran
2022-11-11 13:26:49 +00:00
committed by Gerrit Code Review
parent 442532a714 7a8362c252
commit 59834cc56d
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -1272,10 +1272,6 @@ func (c *deviceConfig) NativeCoverageEnabledForPath(path string) bool {
return coverage return coverage
} }
func (c *deviceConfig) AfdoAdditionalProfileDirs() []string {
return c.config.productVariables.AfdoAdditionalProfileDirs
}
func (c *deviceConfig) PgoAdditionalProfileDirs() []string { func (c *deviceConfig) PgoAdditionalProfileDirs() []string {
return c.config.productVariables.PgoAdditionalProfileDirs return c.config.productVariables.PgoAdditionalProfileDirs
} }

3
android/variable.go
View File

@@ -336,8 +336,7 @@ type productVariables struct {
NamespacesToExport []string `json:",omitempty"` NamespacesToExport []string `json:",omitempty"`
AfdoAdditionalProfileDirs []string `json:",omitempty"` PgoAdditionalProfileDirs []string `json:",omitempty"`
PgoAdditionalProfileDirs []string `json:",omitempty"`
VndkUseCoreVariant *bool `json:",omitempty"` VndkUseCoreVariant *bool `json:",omitempty"`
VndkSnapshotBuildArtifacts *bool `json:",omitempty"` VndkSnapshotBuildArtifacts *bool `json:",omitempty"`

2
cc/afdo.go
View File

@@ -36,7 +36,7 @@ const afdoCFlagsFormat = "-funique-internal-linkage-names -fprofile-sample-accur
func getAfdoProfileProjects(config android.DeviceConfig) []string { func getAfdoProfileProjects(config android.DeviceConfig) []string {
return config.OnceStringSlice(afdoProfileProjectsConfigKey, func() []string { return config.OnceStringSlice(afdoProfileProjectsConfigKey, func() []string {
return append(globalAfdoProfileProjects, config.AfdoAdditionalProfileDirs()...) return globalAfdoProfileProjects
}) })
} }