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

Merge changes from topic "revert-2925209-KVPWEBRQHT" into main

Browse Source 
* changes:
  Revert "Convert AFDO mutators to TransitionMutator"
  Revert "Remove fdoProfileMutator"
This commit is contained in:
Ke-Yu Lu
2024-02-06 05:46:07 +00:00
committed by Gerrit Code Review
parent f7757f1246 0be9d6034e
commit 196d9493c4
6 changed files with 167 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@@ -1493,18 +1493,18 @@ func (c *deviceConfig) PgoAdditionalProfileDirs() []string {
}
// AfdoProfile returns fully qualified path associated to the given module name
func (c *deviceConfig) AfdoProfile(name string) (string, error) {
func (c *deviceConfig) AfdoProfile(name string) (*string, error) {
for _, afdoProfile := range c.config.productVariables.AfdoProfiles {
split := strings.Split(afdoProfile, ":")
if len(split) != 3 {
return "", fmt.Errorf("AFDO_PROFILES has invalid value: %s. "+
return nil, fmt.Errorf("AFDO_PROFILES has invalid value: %s. "+
"The expected format is <module>:<fully-qualified-path-to-fdo_profile>", afdoProfile)
}
if split[0] == name {
return strings.Join([]string{split[1], split[2]}, ":"), nil
return proptools.StringPtr(strings.Join([]string{split[1], split[2]}, ":")), nil
}
}
return "", nil
return nil, nil
}
func (c *deviceConfig) VendorSepolicyDirs() []string {