ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Populate BRILLO_CRASH_SERVER from the product config"

Browse source 
am: d3b177ccb5

* commit 'd3b177ccb5502306546a357d0897e2552384b18c':
  Populate BRILLO_CRASH_SERVER from the product config
This commit is contained in:
Will Drewry 2015-11-05 03:40:30 +00:00 • committed by android-build-merger
commit a987cc9733
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crash_reporter/Android.mk
View file

@ -102,9 +102,13 @@ LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY) LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)
include $(BUILD_SYSTEM)/base_rules.mk 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 # If the crash server isn't set, use a blank value. crash_sender
# will log it as a configuration error. # 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): $(LOCAL_BUILT_MODULE):
$(hide)mkdir -p $(dir $@) $(hide)mkdir -p $(dir $@)
echo $(BRILLO_CRASH_SERVER) > $@ echo $(BRILLO_CRASH_SERVER) > $@