chromeos-base/crash-reporter: Fix build
It seems that the BUILD.gn for crash reporter does not state crash reporter
dependencies correctly, resulting in link errors when building the
"anomaly_reporter" target. I don't know why ChromeOS builds appear to be
succeeding. To unblock our immediate work, let's patch in
a fix for this. I will upstream this fix later, and we can take it
through a cherry-pick or rollup.
BUG=b/177232752
TEST=local build-executor run with lakitu, kumo, anthos-amd64-vsphere
RELEASE_NOTE=None
Change-Id: If93517f8092938ccb2bd91b2b1b59303340e8709
Reviewed-on: https://cos-review.googlesource.com/c/third_party/overlays/chromiumos-overlay/+/10928
Tested-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Reviewed-by: Saied Kazemi <saied@google.com>
diff --git a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3467.ebuild b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3468.ebuild
similarity index 98%
rename from chromeos-base/crash-reporter/crash-reporter-0.0.1-r3467.ebuild
rename to chromeos-base/crash-reporter/crash-reporter-0.0.1-r3468.ebuild
index bcad659..3291115 100644
--- a/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3467.ebuild
+++ b/chromeos-base/crash-reporter/crash-reporter-0.0.1-r3468.ebuild
@@ -49,6 +49,10 @@
chromeos-base/vm_protos:=
"
+PATCHES="
+ ${FILESDIR}/0001-crash-reporter-Fix-anomaly_detector-build.patch
+"
+
src_configure() {
platform_src_configure
use cheets && use_i686 && platform_src_configure_i686
diff --git a/chromeos-base/crash-reporter/crash-reporter-9999.ebuild b/chromeos-base/crash-reporter/crash-reporter-9999.ebuild
index 7c7d7dc..191c457 100644
--- a/chromeos-base/crash-reporter/crash-reporter-9999.ebuild
+++ b/chromeos-base/crash-reporter/crash-reporter-9999.ebuild
@@ -47,6 +47,10 @@
chromeos-base/vm_protos:=
"
+PATCHES="
+ ${FILESDIR}/0001-crash-reporter-Fix-anomaly_detector-build.patch
+"
+
src_configure() {
platform_src_configure
use cheets && use_i686 && platform_src_configure_i686
diff --git a/chromeos-base/crash-reporter/files/0001-crash-reporter-Fix-anomaly_detector-build.patch b/chromeos-base/crash-reporter/files/0001-crash-reporter-Fix-anomaly_detector-build.patch
new file mode 100644
index 0000000..497c163
--- /dev/null
+++ b/chromeos-base/crash-reporter/files/0001-crash-reporter-Fix-anomaly_detector-build.patch
@@ -0,0 +1,33 @@
+From 3ec633564cca33cca76177d31b8d7cf6915cfdd4 Mon Sep 17 00:00:00 2001
+From: Robert Kolchmeyer <rkolchmeyer@google.com>
+Date: Wed, 20 Jan 2021 17:27:26 -0800
+Subject: [PATCH] crash-reporter: Fix anomaly_detector build
+
+libcrash depends on symbol VmSupport::Get, which is defined in
+libcrash_reporter. Let's add that dependency to BUILD.gn.
+
+BUG=b/177232752
+TEST=emerge-lakitu crash-reporter
+
+Change-Id: Ic9d30bf29511e92c2b1c4272dce9724dba17a520
+---
+ crash-reporter/BUILD.gn | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/BUILD.gn b/BUILD.gn
+index 0e6f0c2b21a..1c385b75556 100644
+--- a/BUILD.gn
++++ b/BUILD.gn
+@@ -50,6 +50,9 @@ static_library("libcrash") {
+ "paths.cc",
+ "util.cc",
+ ]
++ deps = [
++ ":libcrash_reporter",
++ ]
+
+ defines = [ "USE_DIRENCRYPTION=${use.direncryption}" ]
+
+--
+2.30.0.296.g2bfb1c46d8-goog
+
