diff options
| author | Will Drewry <drewry@google.com> | 2015-11-05 03:37:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-05 03:37:02 +0000 |
| commit | d3b177ccb5502306546a357d0897e2552384b18c (patch) | |
| tree | 812161f199e9f14cddd5ec2bdb2c25e0e6634a8f | |
| parent | 11d18f1491430902939e8d3be4d895e6e950f00c (diff) | |
| parent | e680f358ece3d6047f7b61c07267d8d87cea9cf5 (diff) | |
Merge "Populate BRILLO_CRASH_SERVER from the product config"
| -rw-r--r-- | crash_reporter/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crash_reporter/Android.mk b/crash_reporter/Android.mk index c5ca4e40c..81cb458f5 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) > $@ |