From 664571eb7735c9e027c957cde35f55745ed1bc27 Mon Sep 17 00:00:00 2001
From: Will Drewry <drewry@google.com>
Date: Wed, 4 Nov 2015 18:48:30 -0800
Subject: [PATCH] Populate BRILLO_CRASH_SERVER from the product config

Using cfgtree.mk, this change adds support to load the
crash server URL directly from a file in the product tree
during the build.

BUG=25343470
TEST=build image, check in etc for the populated osrelease.d file

(cherry picked from commit e680f358ece3d6047f7b61c07267d8d87cea9cf5)

Change-Id: I28879ec7b82f3cda2a02a97a116368ca2fbbdc8b
---
 crash_reporter/Android.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crash_reporter/Android.mk b/crash_reporter/Android.mk
index c5ca4e40c2..81cb458f51 100644
--- a/crash_reporter/Android.mk
+++ b/crash_reporter/Android.mk
@@ -102,9 +102,13 @@ LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)
 include $(BUILD_SYSTEM)/base_rules.mk
 
+# Optionally populate the BRILLO_CRASH_SERVER variable from a product
+# configuration file: brillo/crash_server.
+LOADED_BRILLO_CRASH_SERVER := $(call cfgtree-get-if-exists,brillo/crash_server)
+
 # If the crash server isn't set, use a blank value.  crash_sender
 # will log it as a configuration error.
-$(LOCAL_BUILT_MODULE): BRILLO_CRASH_SERVER ?= ""
+$(LOCAL_BUILT_MODULE): BRILLO_CRASH_SERVER ?= "$(LOADED_BRILLO_CRASH_SERVER)"
 $(LOCAL_BUILT_MODULE):
 	$(hide)mkdir -p $(dir $@)
 	echo $(BRILLO_CRASH_SERVER) > $@
-- 
GitLab