From 345e25783a865987bff2fdd0b40fa95eaed2c1b2 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Thu, 14 May 2020 15:57:51 -0700 Subject: [PATCH] Correct apex data in androidmk for flattened apex Incorrectly used fmt.Println, printing to stdout instead of the desired file. Test: m com.android.art.testing Bug: 155820504 Change-Id: I1aaf15de4f18f71710bc344bc8f71723e9756ad4 --- apex/androidmk.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/androidmk.go b/apex/androidmk.go index 09d360709..6b168fee4 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -121,7 +121,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo fmt.Fprintln(w, "LOCAL_MODULE_SYMLINKS :=", strings.Join(fi.symlinks, " ")) } 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 {