Merge "apex: emit file_contexts for flattened apex"

2020-10-06 03:26:14 +00:00
parent 66fee25c5b 7f146c0da1
commit 51ce6b0acc
3 changed files with 33 additions and 42 deletions
--- a/apex/androidmk.go
+++ b/apex/androidmk.go
@@ -264,6 +264,10 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
 						postInstallCommands = append(postInstallCommands, a.compatSymlinks...)
 					}
 				}
+
+				// File_contexts of flattened APEXes should be merged into file_contexts.bin
+				fmt.Fprintln(w, "LOCAL_FILE_CONTEXTS :=", a.fileContexts)
+
 				if len(postInstallCommands) > 0 {
 					fmt.Fprintln(w, "LOCAL_POST_INSTALL_CMD :=", strings.Join(postInstallCommands, " && "))
 				}