commit 0b0e1b98048a6d7a5efb699447253202f1d1d52a
author Jiyong Park <jiyong@google.com> Tue Dec 03 13:24:29 2019 +0900
committer Jiyong Park <jiyong@google.com> Wed Dec 11 17:25:27 2019 +0900
tree 92d27f5bced3bb5a862bcb8dbb3fa387f9fac272
parent ce482dce028b135239fa1341a617bb54394388f5

AndroidMkEntries() returns multiple AndroidMkEntries structs

AndroidMkEntries now returns multiple AndroidMkEntires so that a module
can emit multiple Make modules if needed.

Bug: 128708192
Test: m

Change-Id: I56b6f76d22943b80329951c5acb80a1b932441ad

android/sh_binary_test.go

diff --git a/android/sh_binary_test.go b/android/sh_binary_test.go
index a138754..8488fe4 100644
--- a/android/sh_binary_test.go
+++ b/android/sh_binary_test.go
@@ -42,7 +42,7 @@
 
 	mod := ctx.ModuleForTests("foo", "android_arm64_armv8-a").Module().(*ShTest)
 
-	entries := AndroidMkEntriesForTest(t, config, "", mod)
+	entries := AndroidMkEntriesForTest(t, config, "", mod)[0]
 	expected := []string{":testdata/data1", ":testdata/sub/data2"}
 	actual := entries.EntryMap["LOCAL_TEST_DATA"]
 	if !reflect.DeepEqual(expected, actual) {