Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e25d9a2d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change condition to match go/thirdpartylicenses" am: e6b22628 am: 86fe086b 

Original change: https://android-review.googlesource.com/c/platform/build/+/2313302



Change-Id: I4f64ae6403cb95d0d39ab7cd58d45af25ed74bb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27bd614c 86fe086b

tools/compliance/cmd/dumpgraph/dumpgraph_test.go

+3 −3
Original line number Diff line number Diff line
@@ -341,13 +341,13 @@ func Test_plaintext(t *testing.T) { 
			roots:     []string{"highest.apex.meta_lic"},

			ctx:       context{stripPrefix: []string{"testdata/restricted/"}, labelConditions: true},

			expectedOut: []string{

				"bin/bin1.meta_lic:notice lib/liba.so.meta_lic:restricted_allows_dynamic_linking static",

				"bin/bin1.meta_lic:notice lib/liba.so.meta_lic:restricted_if_statically_linked static",

				"bin/bin1.meta_lic:notice lib/libc.a.meta_lic:reciprocal static",

				"bin/bin2.meta_lic:notice lib/libb.so.meta_lic:restricted dynamic",

				"bin/bin2.meta_lic:notice lib/libd.so.meta_lic:notice dynamic",

				"highest.apex.meta_lic:notice bin/bin1.meta_lic:notice static",

				"highest.apex.meta_lic:notice bin/bin2.meta_lic:notice static",

				"highest.apex.meta_lic:notice lib/liba.so.meta_lic:restricted_allows_dynamic_linking static",

				"highest.apex.meta_lic:notice lib/liba.so.meta_lic:restricted_if_statically_linked static",

				"highest.apex.meta_lic:notice lib/libb.so.meta_lic:restricted static",

			},

		},
@@ -1011,7 +1011,7 @@ func Test_graphviz(t *testing.T) { 
				matchTarget("bin/bin1.meta_lic", "notice"),

				matchTarget("bin/bin2.meta_lic", "notice"),

				matchTarget("highest.apex.meta_lic", "notice"),

				matchTarget("lib/liba.so.meta_lic", "restricted_allows_dynamic_linking"),

				matchTarget("lib/liba.so.meta_lic", "restricted_if_statically_linked"),

				matchTarget("lib/libb.so.meta_lic", "restricted"),

				matchTarget("lib/libc.a.meta_lic", "reciprocal"),

				matchTarget("lib/libd.so.meta_lic", "notice"),