openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Reformat license code to comply with preupload checks" am: 279790a48a am: 79a2c4d119 am: 94f5e6d478 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib69709a3b9821f564055c125e9657d10d52f8715
This commit is contained in:
Paul Duffin 2021-03-05 10:20:38 +00:00 committed by Automerger Merge Worker
parent e26cd8f5a0 94f5e6d478
commit 214cbdada6
4 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/license_test.go
View File

@ -49,9 +49,9 @@ var licenseTests = []struct {
}`),
},
expectedErrors: []string{
`other/Blueprints:2:5: module "arule": depends on //top:top_allowed_as_notice `+
`other/Blueprints:2:5: module "arule": depends on //top:top_allowed_as_notice ` +
`which is not visible to this module`,
`yetmore/Blueprints:2:5: module "//yetmore": depends on //top:top_allowed_as_notice `+
`yetmore/Blueprints:2:5: module "//yetmore": depends on //top:top_allowed_as_notice ` +
`which is not visible to this module`,
},
},
@ -70,7 +70,7 @@ var licenseTests = []struct {
}`),
},
expectedErrors: []string{
`top/Blueprints:6:5: module "top_proprietary": license_kinds property `+
`top/Blueprints:6:5: module "top_proprietary": license_kinds property ` +
`"top_by_exception_only" is not a license_kind module`,
},
},