From 96408df2045bf8c233c867fa4cd58b9f01e6075a Mon Sep 17 00:00:00 2001
From: Jorge Lucangeli Obes <jorgelo@google.com>
Date: Mon, 28 Sep 2015 12:51:54 -0700
Subject: [PATCH] Simplify Makefile for crash_reporter.

We can use the LOCAL_INIT_RC variable for init.rc files.

Also, switch to use <service>.rc for the filename, since this is what
Android does now.

Bug: 24465893
Change-Id: I924acbe758ba9994020093005e27c8c06d0686ff
---
 crash_reporter/Android.mk                         | 15 ++-------------
 .../{init.crash_reporter.rc => crash_reporter.rc} |  0
 2 files changed, 2 insertions(+), 13 deletions(-)
 rename crash_reporter/{init.crash_reporter.rc => crash_reporter.rc} (100%)

diff --git a/crash_reporter/Android.mk b/crash_reporter/Android.mk
index 6cd34ab6f..d122972e3 100644
--- a/crash_reporter/Android.mk
+++ b/crash_reporter/Android.mk
@@ -62,8 +62,8 @@ LOCAL_C_INCLUDES := $(crash_reporter_includes)
 LOCAL_REQUIRED_MODULES := core2md \
     crash_reporter_logs.conf \
     crash_sender \
-    dbus-send \
-    init.crash_reporter.rc
+    dbus-send
+LOCAL_INIT_RC := crash_reporter.rc
 LOCAL_RTTI_FLAG := -frtti
 LOCAL_SHARED_LIBRARIES := libchrome \
     libchromeos \
@@ -94,17 +94,6 @@ LOCAL_SHARED_LIBRARIES := libmetrics
 LOCAL_SRC_FILES := $(warn_collector_src)
 include $(BUILD_EXECUTABLE)
 
-# Crash reporter init script.
-# ========================================================
-ifdef TARGET_COPY_OUT_INITRCD
-include $(CLEAR_VARS)
-LOCAL_MODULE := init.crash_reporter.rc
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_INITRCD)
-LOCAL_SRC_FILES := init.crash_reporter.rc
-include $(BUILD_PREBUILT)
-endif
-
 # Crash reporter logs conf file.
 # ========================================================
 include $(CLEAR_VARS)
diff --git a/crash_reporter/init.crash_reporter.rc b/crash_reporter/crash_reporter.rc
similarity index 100%
rename from crash_reporter/init.crash_reporter.rc
rename to crash_reporter/crash_reporter.rc