summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorAlex Vakulenko <avakulenko@google.com>2015-09-10 15:07:05 -0700
committerAlex Vakulenko <avakulenko@google.com>2015-09-10 15:07:05 -0700
commit8c18d72d7232f77e53d617ec97b99f7aba39cf8e (patch)
treea3d66625420ff33cef2279adabf77fd1b43eed11 /Android.mk
parent65647f2c786074dddca93b702469e47c7e904cf1 (diff)
downloadfirewalld-8c18d72d7232f77e53d617ec97b99f7aba39cf8e.tar.gz
Use LOCAL_INIT_RC to install the init script for firewalld
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: Ie0f23ec30890dc163063e1592eb3388669f3dfbf
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk12
1 files changed, 1 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk
index ac7ef41..c60a621 100644
--- a/Android.mk
+++ b/Android.mk
@@ -59,7 +59,7 @@ include $(BUILD_STATIC_TEST_LIBRARY)
# === firewalld ===
include $(CLEAR_VARS)
LOCAL_MODULE := firewalld
-LOCAL_REQUIRED_MODULES := init.firewalld.rc
+LOCAL_INIT_RC := init.firewalld.rc
LOCAL_SRC_FILES := \
main.cc
LOCAL_STATIC_LIBRARIES := libfirewalld
@@ -67,16 +67,6 @@ LOCAL_C_INCLUDES += external/gtest/include
$(eval $(firewalld_common))
include $(BUILD_EXECUTABLE)
-# === init.firewalld.rc (brillo only) ===
-ifdef TARGET_COPY_OUT_INITRCD
-include $(CLEAR_VARS)
-LOCAL_MODULE := init.firewalld.rc
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_INITRCD)
-include $(BUILD_PREBUILT)
-endif
-
# === unittest ===
include $(CLEAR_VARS)
LOCAL_MODULE := firewalld_unittest