From 6cac8cbb26d2b22d486306b3ae897030f11154e0 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 15 Jun 2023 15:01:30 -0700 Subject: [PATCH] Add implementation whole archive deps to binaries ...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 --- android/allowlists/allowlists.go | 1 + cc/binary.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/android/allowlists/allowlists.go b/android/allowlists/allowlists.go index 78f1de247..af97325e4 100644 --- a/android/allowlists/allowlists.go +++ b/android/allowlists/allowlists.go @@ -190,6 +190,7 @@ var ( "external/python/six": Bp2BuildDefaultTrueRecursively, "external/rappor": Bp2BuildDefaultTrueRecursively, "external/scudo": Bp2BuildDefaultTrueRecursively, + "external/selinux/checkpolicy": Bp2BuildDefaultTrueRecursively, "external/selinux/libselinux": Bp2BuildDefaultTrueRecursively, "external/selinux/libsepol": Bp2BuildDefaultTrueRecursively, "external/speex": Bp2BuildDefaultTrueRecursively, diff --git a/cc/binary.go b/cc/binary.go index 14f93e9a8..5ba33a24a 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -609,6 +609,9 @@ func binaryBp2buildAttrs(ctx android.TopDownMutatorContext, m *Module) binaryAtt baseAttrs.implementationDeps.Add(baseAttrs.protoDependency) } + // binaries don't have implementation_whole_archive_deps + baseAttrs.wholeArchiveDeps.Append(baseAttrs.implementationWholeArchiveDeps) + attrs := binaryAttributes{ binaryLinkerAttrs: binaryLinkerAttrs,