From 9877279855af78a4376a09f022f476d88b406adb Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Mon, 1 Jul 2019 17:15:13 -0700 Subject: Dist NOTICE outputs for app targets. Bug: 136501164 Test: m NetworkStack, TreeHugger Change-Id: I2279eeb0e50b1b5685e23130a8da6ab090f37f56 --- java/app_test.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'java/app_test.go') diff --git a/java/app_test.go b/java/app_test.go index c7ea338b1..721dd4dc2 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -1479,16 +1479,20 @@ func TestEmbedNotice(t *testing.T) { // bar has NOTICE files to process, but embed_notices is not set. bar := ctx.ModuleForTests("bar", "android_common") - mergeNotices = bar.MaybeRule("mergeNoticesRule") - if mergeNotices.Rule != nil { - t.Errorf("mergeNotices shouldn't have run for bar") + res = bar.Output("package-res.apk") + aapt2Flags = res.Args["flags"] + e = "-A " + buildDir + "/.intermediates/bar/android_common/NOTICE" + if strings.Contains(aapt2Flags, e) { + t.Errorf("bar shouldn't have the asset dir flag for NOTICE: %q", e) } // baz's embed_notice is true, but it doesn't have any NOTICE files. baz := ctx.ModuleForTests("baz", "android_common") - mergeNotices = baz.MaybeRule("mergeNoticesRule") - if mergeNotices.Rule != nil { - t.Errorf("mergeNotices shouldn't have run for baz") + res = baz.Output("package-res.apk") + aapt2Flags = res.Args["flags"] + e = "-A " + buildDir + "/.intermediates/baz/android_common/NOTICE" + if strings.Contains(aapt2Flags, e) { + t.Errorf("baz shouldn't have the asset dir flag for NOTICE: %q", e) } } -- cgit v1.2.3-59-g8ed1b