From aa2555387d214fc0292406d10714558054d794f3 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 3 Jul 2020 13:18:24 -0700 Subject: Add ctx to AndroidMkExtraEntriesFunc Add a ctx parameter to AndroidMkExtraEntriesFunc to allow them to access providers. Test: m checkbuild Change-Id: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc Merged-In: Id6becc1e425c3c3d8519248f8c0ce80777fac7cc --- java/java_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/java_test.go') diff --git a/java/java_test.go b/java/java_test.go index e7776c35d..4ab178fa9 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2406,7 +2406,7 @@ func TestAidlFlagsArePassedToTheAidlCompiler(t *testing.T) { } func TestDataNativeBinaries(t *testing.T) { - ctx, config := testJava(t, ` + ctx, _ := testJava(t, ` java_test_host { name: "foo", srcs: ["a.java"], @@ -2422,7 +2422,7 @@ func TestDataNativeBinaries(t *testing.T) { buildOS := android.BuildOs.String() test := ctx.ModuleForTests("foo", buildOS+"_common").Module().(*TestHost) - entries := android.AndroidMkEntriesForTest(t, config, "", test)[0] + entries := android.AndroidMkEntriesForTest(t, ctx, test)[0] expected := []string{buildDir + "/.intermediates/bin/" + buildOS + "_x86_64_PY3/bin:bin"} actual := entries.EntryMap["LOCAL_COMPATIBILITY_SUPPORT_FILES"] if !reflect.DeepEqual(expected, actual) { -- cgit v1.2.3-59-g8ed1b