Merge "Correct apex data in androidmk for flattened apex" am: 28f34bf920

Change-Id: I44a0f79e3af3513b181970c5b548cfcbca0b6c34
This commit is contained in:
Treehugger Robot
2020-05-19 19:34:15 +00:00
committed by Automerger Merge Worker

View File

@@ -121,7 +121,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
fmt.Fprintln(w, "LOCAL_MODULE_SYMLINKS :=", strings.Join(fi.symlinks, " ")) fmt.Fprintln(w, "LOCAL_MODULE_SYMLINKS :=", strings.Join(fi.symlinks, " "))
} }
if len(fi.dataPaths) > 0 { if len(fi.dataPaths) > 0 {
fmt.Println(w, "LOCAL_TEST_DATA :=", strings.Join(cc.AndroidMkDataPaths(fi.dataPaths), " ")) fmt.Fprintln(w, "LOCAL_TEST_DATA :=", strings.Join(cc.AndroidMkDataPaths(fi.dataPaths), " "))
} }
if fi.module != nil && len(fi.module.NoticeFiles()) > 0 { if fi.module != nil && len(fi.module.NoticeFiles()) > 0 {