From dcb61292695c740d1fac37a8e06ddfc763cebe83 Mon Sep 17 00:00:00 2001 From: Sasha Smundak Date: Thu, 8 Dec 2022 10:41:33 -0800 Subject: Streamline AndroidMk generation Add AndroidMkEmitAssignList to emit a line to assign the items from the given list of string arrays. Test: treehugger Change-Id: Id5acbef38ea4e91349bd2461f226db352d4b8123 --- java/robolectric.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'java/robolectric.go') diff --git a/java/robolectric.go b/java/robolectric.go index 938abe138..6e8d5913c 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -330,11 +330,10 @@ func (r *robolectricTest) writeTestRunner(w io.Writer, module, name string, test fmt.Fprintln(w, "") fmt.Fprintln(w, "include $(CLEAR_VARS)", " # java.robolectricTest") fmt.Fprintln(w, "LOCAL_MODULE :=", name) - fmt.Fprintln(w, "LOCAL_JAVA_LIBRARIES :=", module) - fmt.Fprintln(w, "LOCAL_JAVA_LIBRARIES += ", strings.Join(r.libs, " ")) + android.AndroidMkEmitAssignList(w, "LOCAL_JAVA_LIBRARIES", []string{module}, r.libs) fmt.Fprintln(w, "LOCAL_TEST_PACKAGE :=", String(r.robolectricProperties.Instrumentation_for)) fmt.Fprintln(w, "LOCAL_INSTRUMENT_SRCJARS :=", r.roboSrcJar.String()) - fmt.Fprintln(w, "LOCAL_ROBOTEST_FILES :=", strings.Join(tests, " ")) + android.AndroidMkEmitAssignList(w, "LOCAL_ROBOTEST_FILES", tests) if t := r.robolectricProperties.Test_options.Timeout; t != nil { fmt.Fprintln(w, "LOCAL_ROBOTEST_TIMEOUT :=", *t) } -- cgit v1.2.3-59-g8ed1b