StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add implementation whole archive deps to binaries

Browse Source 
...as regular whole archive deps because binaries don't have
implementation whole archive deps.

Also allowlist checkpolicy which requires this change.

Test: bp2build presubmits should now build checkpolicy
Change-Id: I1f98312da249ea1f37004ccba8799449bdbc4718
This commit is contained in:
Cole Faust
2023-06-15 15:01:30 -07:00
parent d34e4c72f3
commit 6cac8cbb26
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/allowlists/allowlists.go
View File

@@ -190,6 +190,7 @@ var (
"external/python/six": Bp2BuildDefaultTrueRecursively, "external/python/six": Bp2BuildDefaultTrueRecursively,
"external/rappor": Bp2BuildDefaultTrueRecursively, "external/rappor": Bp2BuildDefaultTrueRecursively,
"external/scudo": Bp2BuildDefaultTrueRecursively, "external/scudo": Bp2BuildDefaultTrueRecursively,
"external/selinux/checkpolicy": Bp2BuildDefaultTrueRecursively,
"external/selinux/libselinux": Bp2BuildDefaultTrueRecursively, "external/selinux/libselinux": Bp2BuildDefaultTrueRecursively,
"external/selinux/libsepol": Bp2BuildDefaultTrueRecursively, "external/selinux/libsepol": Bp2BuildDefaultTrueRecursively,
"external/speex": Bp2BuildDefaultTrueRecursively, "external/speex": Bp2BuildDefaultTrueRecursively,

3
cc/binary.go
View File

@@ -609,6 +609,9 @@ func binaryBp2buildAttrs(ctx android.TopDownMutatorContext, m *Module) binaryAtt
baseAttrs.implementationDeps.Add(baseAttrs.protoDependency) baseAttrs.implementationDeps.Add(baseAttrs.protoDependency)
} }
// binaries don't have implementation_whole_archive_deps
baseAttrs.wholeArchiveDeps.Append(baseAttrs.implementationWholeArchiveDeps)
attrs := binaryAttributes{ attrs := binaryAttributes{
binaryLinkerAttrs: binaryLinkerAttrs, binaryLinkerAttrs: binaryLinkerAttrs,