Merge "Sort the file with image content."

2019-10-28 23:29:58 +00:00 · 2019-10-28 23:29:58 +00:00 · 4f45daf9ed
parent f979ee3873 e423582f07
commit 4f45daf9ed
1 changed files with 2 additions and 0 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@ -1374,6 +1374,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, apexType ap
 			copyCommands = append(copyCommands, "ln -s "+filepath.Base(dest)+" "+symlinkDest)
 		}
 	}
+	emitCommands = append(emitCommands, "sort -o "+imageContentFile.String()+" "+imageContentFile.String())
+
 	implicitInputs := append(android.Paths(nil), filesToCopy...)
 	implicitInputs = append(implicitInputs, a.manifestOut)