aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2015-09-10 14:33:24 -0700
committerAlex Vakulenko <avakulenko@google.com>2015-09-10 14:33:24 -0700
commitc947418f6c7c8329e251aa5c31dbfe408030f2db (patch)
tree40c386750dbe31da825085cf32586fcd0b78bc57
parentbc64849acd031deb5920a16311e8524a7a7390c3 (diff)
downloadweaved-c947418f6c7c8329e251aa5c31dbfe408030f2db.tar.gz
Use LOCAL_INIT_RC to install the init script for weaved
Now there is a better way to install the init scripts using LOCAL_INIT_RC instead of manually copying the file with PREBUILT rule. Change-Id: Ibcfb7c405895a0c39301dbc4ce939c4fb9935cd1
-rw-r--r--Android.mk13
1 files changed, 1 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index 46c18cb..f72dabf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -108,13 +108,13 @@ LOCAL_REQUIRED_MODULES := \
weaved.json \
com.android.Weave.conf \
gcd.json \
- init.weaved.rc \
webservd \
LOCAL_CPP_EXTENSION := $(buffetCommonCppExtension)
LOCAL_CFLAGS := $(buffetCommonCFlags)
LOCAL_CPPFLAGS := $(buffetCommonCppFlags)
LOCAL_C_INCLUDES := $(buffetCommonCIncludes)
+LOCAL_INIT_RC := init.weaved.rc
LOCAL_SHARED_LIBRARIES := $(buffetSharedLibraries)
LOCAL_WHOLE_STATIC_LIBRARIES := buffet-common
LOCAL_CLANG := true
@@ -193,17 +193,6 @@ LOCAL_SRC_FILES := \
include $(BUILD_EXECUTABLE)
-# init.weaved.rc (Brillo only)
-# ========================================================
-ifdef TARGET_COPY_OUT_INITRCD
-include $(CLEAR_VARS)
-LOCAL_MODULE := init.weaved.rc
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_INITRCD)
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-endif
-
# Config files for /etc/weaved
# ========================================================
include $(CLEAR_VARS)