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 Original line Diff line number Diff line
@@ -341,13 +341,13 @@ func Test_plaintext(t *testing.T) { 
			roots:     []string{"highest.apex.meta_lic"},

			roots:     []string{"highest.apex.meta_lic"},

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

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

			expectedOut: []string{

			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/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/libb.so.meta_lic:restricted dynamic",

				"bin/bin2.meta_lic:notice lib/libd.so.meta_lic:notice 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/bin1.meta_lic:notice static",

				"highest.apex.meta_lic:notice bin/bin2.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",

				"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/bin1.meta_lic", "notice"),

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

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

				matchTarget("highest.apex.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/libb.so.meta_lic", "restricted"),

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

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

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

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

tools/compliance/cmd/dumpresolutions/dumpresolutions_test.go

+107 −107

File changed.

Preview size limit exceeded, changes collapsed.

tools/compliance/cmd/listshare/listshare_test.go

+11 −11
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ func Test(t *testing.T) { 
				},

				},

				{

				{

					project:    "device/library",

					project:    "device/library",

					conditions: []string{"restricted_allows_dynamic_linking"},

					conditions: []string{"restricted_if_statically_linked"},

				},

				},

				{

				{

					project:    "dynamic/binary",

					project:    "dynamic/binary",
@@ -196,14 +196,14 @@ func Test(t *testing.T) { 
				{

				{

					project: "static/binary",

					project: "static/binary",

					conditions: []string{

					conditions: []string{

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

				{

				{

					project: "static/library",

					project: "static/library",

					conditions: []string{

					conditions: []string{

						"reciprocal",

						"reciprocal",

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

			},

			},
@@ -219,7 +219,7 @@ func Test(t *testing.T) { 
				},

				},

				{

				{

					project:    "device/library",

					project:    "device/library",

					conditions: []string{"restricted_allows_dynamic_linking"},

					conditions: []string{"restricted_if_statically_linked"},

				},

				},

				{

				{

					project:    "dynamic/binary",

					project:    "dynamic/binary",
@@ -228,14 +228,14 @@ func Test(t *testing.T) { 
				{

				{

					project: "static/binary",

					project: "static/binary",

					conditions: []string{

					conditions: []string{

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

				{

				{

					project: "static/library",

					project: "static/library",

					conditions: []string{

					conditions: []string{

						"reciprocal",

						"reciprocal",

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

			},

			},
@@ -249,14 +249,14 @@ func Test(t *testing.T) { 
					project: "device/library",

					project: "device/library",

					conditions: []string{

					conditions: []string{

						"restricted",

						"restricted",

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

				{

				{

					project: "distributable/application",

					project: "distributable/application",

					conditions: []string{

					conditions: []string{

						"restricted",

						"restricted",

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

			},

			},
@@ -269,20 +269,20 @@ func Test(t *testing.T) { 
				{

				{

					project: "device/library",

					project: "device/library",

					conditions: []string{

					conditions: []string{

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

				{

				{

					project: "static/binary",

					project: "static/binary",

					conditions: []string{

					conditions: []string{

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

				{

				{

					project: "static/library",

					project: "static/library",

					conditions: []string{

					conditions: []string{

						"reciprocal",

						"reciprocal",

						"restricted_allows_dynamic_linking",

						"restricted_if_statically_linked",

					},

					},

				},

				},

			},

			},

tools/compliance/cmd/rtrace/rtrace_test.go

+74 −74
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ func Test_plaintext(t *testing.T) { 
			name:      "apex",

			name:      "apex",

			roots:     []string{"highest.apex.meta_lic"},

			roots:     []string{"highest.apex.meta_lic"},

			expectedOut: []string{

			expectedOut: []string{

				"testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",

				"testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",

				"testdata/restricted/lib/libb.so.meta_lic restricted",

				"testdata/restricted/lib/libb.so.meta_lic restricted",

			},

			},

		},

		},
@@ -180,7 +180,7 @@ func Test_plaintext(t *testing.T) { 
				sources:     []string{"testdata/restricted/bin/bin1.meta_lic"},

				sources:     []string{"testdata/restricted/bin/bin1.meta_lic"},

				stripPrefix: []string{"testdata/restricted/"},

				stripPrefix: []string{"testdata/restricted/"},

			},

			},

			expectedOut: []string{"lib/liba.so.meta_lic restricted_allows_dynamic_linking"},

			expectedOut: []string{"lib/liba.so.meta_lic restricted_if_statically_linked"},

		},

		},

		{

		{

			condition: "restricted",

			condition: "restricted",
@@ -197,7 +197,7 @@ func Test_plaintext(t *testing.T) { 
			name:      "container",

			name:      "container",

			roots:     []string{"container.zip.meta_lic"},

			roots:     []string{"container.zip.meta_lic"},

			expectedOut: []string{

			expectedOut: []string{

				"testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking",

				"testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked",

				"testdata/restricted/lib/libb.so.meta_lic restricted",

				"testdata/restricted/lib/libb.so.meta_lic restricted",

			},

			},

		},

		},
@@ -205,13 +205,13 @@ func Test_plaintext(t *testing.T) { 
			condition:   "restricted",

			condition:   "restricted",

			name:        "application",

			name:        "application",

			roots:       []string{"application.meta_lic"},

			roots:       []string{"application.meta_lic"},

			expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking"},

			expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked"},

		},

		},

		{

		{

			condition:   "restricted",

			condition:   "restricted",

			name:        "binary",

			name:        "binary",

			roots:       []string{"bin/bin1.meta_lic"},

			roots:       []string{"bin/bin1.meta_lic"},

			expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_allows_dynamic_linking"},

			expectedOut: []string{"testdata/restricted/lib/liba.so.meta_lic restricted_if_statically_linked"},

		},

		},

		{

		{

			condition:   "restricted",

			condition:   "restricted",

tools/compliance/cmd/testdata/proprietary/bin/bin3.meta_lic

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ package_name: "Compiler" 
module_classes: "EXECUTABLES"

module_classes: "EXECUTABLES"

projects:  "standalone/binary"

projects:  "standalone/binary"

license_kinds:  "SPDX-license-identifier-LGPL-2.0"

license_kinds:  "SPDX-license-identifier-LGPL-2.0"

license_conditions:  "restricted_allows_dynamic_linking"

license_conditions:  "restricted_if_statically_linked"

license_texts:  "testdata/restricted/RESTRICTED_LICENSE"

license_texts:  "testdata/restricted/RESTRICTED_LICENSE"

is_container:  false

is_container:  false

built:  "out/target/product/fictional/obj/EXECUTABLES/bin_intermediates/bin3"

built:  "out/target/product/fictional/obj/EXECUTABLES/bin_intermediates/bin3"