diff options
| author | 2023-03-27 18:51:45 +0000 | |
|---|---|---|
| committer | 2023-03-27 18:51:45 +0000 | |
| commit | 480a562661612ee5bc7e8543b05a2ffd079f77bf (patch) | |
| tree | fd419a43b8f9abf1b2421ee9f302955c82b390cd /apex/builder.go | |
| parent | 2e758305ac0fc5fcada9d6131a6786f4bb1f914a (diff) | |
| parent | 67e2f79eb3980a5c8b94705bb04e660e712a380f (diff) | |
Merge "Revert "Sort canned fs_config lines to facilitate comparison with Bazel-built APEXes""
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/builder.go b/apex/builder.go index 45c52671c..e3b6f8e48 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -1167,7 +1167,7 @@ func (a *apexBundle) buildCannedFsConfig(ctx android.ModuleContext) android.Outp if a.properties.Canned_fs_config != nil { cmd.Text("cat").Input(android.PathForModuleSrc(ctx, *a.properties.Canned_fs_config)) } - cmd.Text(") | LC_ALL=C sort ").FlagWithOutput("> ", cannedFsConfig) + cmd.Text(")").FlagWithOutput("> ", cannedFsConfig) builder.Build("generateFsConfig", fmt.Sprintf("Generating canned fs config for %s", a.BaseModuleName())) return cannedFsConfig.OutputPath |