commit 9b2bc347659de454796acfc9402cbbc170efd133
author Tom Cherry <tomcherry@google.com> Mon Aug 24 23:28:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 24 23:28:36 2015 +0000
tree 2207f7b229be76d6cc84a7a0b8617e75a7fc2a26
parent 6c04e9a9eca2903c2496ec735c359ed57467d52f
parent 77d634f7dddf983605619f83bbacbe8ff27a23bc

am 77d634f7: Merge "remove TARGET_PROVIDES_INIT_RC"

* commit '77d634f7dddf983605619f83bbacbe8ff27a23bc':
  remove TARGET_PROVIDES_INIT_RC

rootdir/Android.mk

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index e1ba2e9..f853fac 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -2,8 +2,6 @@
 
 #######################################
 # init.rc
-# Only copy init.rc if the target doesn't have its own.
-ifneq ($(TARGET_PROVIDES_INIT_RC),true)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := init.rc
@@ -12,7 +10,6 @@
 LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
 
 include $(BUILD_PREBUILT)
-endif
 
 #######################################
 # asan.options