From de6a087d2d289bf01097c152a349a33ea8fa91f8 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 1 Apr 2022 18:00:00 +0000 Subject: Revert "Revert "Build notice files from license metadata."" This reverts commit 77807b3c277723161a193aea2a9df1e464448c3d. Reason for revert: fix and roll forward again Change-Id: I80c796ca81ecf29df9522babe54d684a0d11b9e6 --- apex/apex_test.go | 9 --------- 1 file changed, 9 deletions(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 85bd59526..ec815c4c7 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -591,15 +591,6 @@ func TestBasicApex(t *testing.T) { t.Errorf("Could not find all expected symlinks! foo: %t, foo_link_64: %t. Command was %s", found_foo, found_foo_link_64, copyCmds) } - mergeNoticesRule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("mergeNoticesRule") - noticeInputs := mergeNoticesRule.Inputs.Strings() - if len(noticeInputs) != 3 { - t.Errorf("number of input notice files: expected = 3, actual = %q", len(noticeInputs)) - } - ensureListContains(t, noticeInputs, "NOTICE") - ensureListContains(t, noticeInputs, "custom_notice") - ensureListContains(t, noticeInputs, "custom_notice_for_static_lib") - fullDepsInfo := strings.Split(ctx.ModuleForTests("myapex", "android_common_myapex_image").Output("depsinfo/fulllist.txt").Args["content"], "\\n") ensureListContains(t, fullDepsInfo, " myjar(minSdkVersion:(no version)) <- myapex") ensureListContains(t, fullDepsInfo, " mylib2(minSdkVersion:(no version)) <- mylib") -- cgit v1.2.3-59-g8ed1b