Policy change: GPL+CE is permissive.
Bug: 210546823 Test: m cts compliance_checkshare compliancenotice_bom \ compliancenotice_shippedlibs compliance_listshare \ compliance_dumpgraph compliance_dumpresolutions htmlnotice \ compliance_rtrace textnotice xmlnotice Change-Id: I7da36972ffbb1494e33fd63db8e5ec851d47704c
This commit is contained in:
@@ -375,10 +375,8 @@ func TestResolveNotices(t *testing.T) {
|
||||
},
|
||||
expectedResolutions: []res{
|
||||
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
|
||||
{"apacheBin.meta_lic", "apacheBin.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"apacheBin.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"apacheBin.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "permissive"},
|
||||
{"apacheBin.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
|
||||
{"apacheBin.meta_lic", "mitLib.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -390,10 +388,8 @@ func TestResolveNotices(t *testing.T) {
|
||||
},
|
||||
expectedResolutions: []res{
|
||||
{"dependentModule.meta_lic", "dependentModule.meta_lic", "dependentModule.meta_lic", "notice"},
|
||||
{"dependentModule.meta_lic", "dependentModule.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"dependentModule.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"dependentModule.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "permissive"},
|
||||
{"dependentModule.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
|
||||
{"dependentModule.meta_lic", "mitLib.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -418,7 +414,7 @@ func TestResolveNotices(t *testing.T) {
|
||||
expectedResolutions: []res{
|
||||
{"apacheBin.meta_lic", "apacheBin.meta_lic", "apacheBin.meta_lic", "notice"},
|
||||
{"apacheBin.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
|
||||
{"gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "permissive"},
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -430,9 +426,7 @@ func TestResolveNotices(t *testing.T) {
|
||||
},
|
||||
expectedResolutions: []res{
|
||||
{"dependentModule.meta_lic", "dependentModule.meta_lic", "dependentModule.meta_lic", "notice"},
|
||||
{"dependentModule.meta_lic", "dependentModule.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"dependentModule.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
|
||||
{"dependentModule.meta_lic", "mitLib.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
},
|
||||
},
|
||||
{
|
||||
@@ -444,11 +438,8 @@ func TestResolveNotices(t *testing.T) {
|
||||
},
|
||||
expectedResolutions: []res{
|
||||
{"dependentModule.meta_lic", "dependentModule.meta_lic", "dependentModule.meta_lic", "notice"},
|
||||
{"dependentModule.meta_lic", "dependentModule.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"dependentModule.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"dependentModule.meta_lic", "mitLib.meta_lic", "mitLib.meta_lic", "notice"},
|
||||
{"dependentModule.meta_lic", "mitLib.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "restricted"},
|
||||
{"gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "gplWithClasspathException.meta_lic", "permissive"},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
Reference in New Issue
Block a user