diff options
| author | Robert Ginda <rginda@chromium.org> | 2015-08-20 14:28:44 -0700 |
|---|---|---|
| committer | Robert Ginda <rginda@chromium.org> | 2015-08-20 14:28:44 -0700 |
| commit | bfd5955d3421026b8910a4fe3f13a72ccffd4df9 (patch) | |
| tree | 4e24500a6c3c1ea803e8fbcdddafe0865bdb312a | |
| parent | e55ece9ca0c4d2a322aba5a97bc80ba9e628a94c (diff) | |
| download | avahi-bfd5955d3421026b8910a4fe3f13a72ccffd4df9.tar.gz | |
Stop using LOCAL_INIT_SERVICE variable.
Change-Id: I25f9669bb3d2bfd55dc30994b20c0610058c20fb
| -rw-r--r-- | avahi-daemon/Android.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/avahi-daemon/Android.mk b/avahi-daemon/Android.mk index 2abb8f2..884f3f2 100644 --- a/avahi-daemon/Android.mk +++ b/avahi-daemon/Android.mk @@ -2,15 +2,13 @@ LOCAL_PATH:=$(call my-dir) # Build avahi-daemon, install the conf file, and generate the init rc file. -LOCAL_INIT_SERVICE := avahi-daemon - include $(CLEAR_VARS) -LOCAL_MODULE := $(LOCAL_INIT_SERVICE) +LOCAL_MODULE := avahi-deamon LOCAL_REQUIRED_MODULES := \ - $(LOCAL_INIT_SERVICE).conf \ - init.$(LOCAL_INIT_SERVICE).rc \ + avahi-daemon.conf \ + init.avahi-daemon.rc \ LOCAL_SRC_FILES := \ main.c \ @@ -94,8 +92,8 @@ include $(BUILD_EXECUTABLE) # /system/etc/avahi-daemon.conf include $(CLEAR_VARS) -LOCAL_MODULE := $(LOCAL_INIT_SERVICE).conf -LOCAL_SRC_FILES := $(LOCAL_INIT_SERVICE).conf +LOCAL_MODULE := avahi-daemon.conf +LOCAL_SRC_FILES := avahi-daemon.conf LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TARGET := $(TARGET_OUT_ETC) include $(BUILD_PREBUILT) @@ -103,7 +101,7 @@ include $(BUILD_PREBUILT) # init.avahi-daemon.rc generation ifdef INITRC_TEMPLATE include $(CLEAR_VARS) -LOCAL_MODULE := init.$(LOCAL_INIT_SERVICE).rc +LOCAL_MODULE := init.avahi-daemon.rc LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_INITRCD) @@ -111,6 +109,6 @@ include $(BUILD_SYSTEM)/base_rules.mk .PHONY: $(LOCAL_BUILT_MODULE) $(LOCAL_BUILT_MODULE): $(INITRC_TEMPLATE) - $(call generate-initrc-file,$(LOCAL_INIT_SERVICE),\ + $(call generate-initrc-file,avahi-daemon,\ --syslog --no-drop-root,inet) endif |