diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2015-08-21 15:15:21 -0700 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2015-08-21 16:05:27 -0700 |
| commit | b0656bdf8bb327c4b127c8f64a051d15068a5940 (patch) | |
| tree | f2afa47dd8ce3652b999934761ada217c2a17d03 | |
| parent | cf92c66d1aa30678beaa64501c9febc3933c23a9 (diff) | |
| download | weaved-b0656bdf8bb327c4b127c8f64a051d15068a5940.tar.gz | |
system/weaved: Fix the location of device_registration_info file
On ChromeOS, buffet saved this file in /var/lib/buffet/ directory.
/var doesn't exist on Brillo, but other daemons save their own
settings under /data/misc, so update weaved to do the same.
Had to create /data/misc/weaved at system boot and change the init
class of weaved to late_start because it needs to start only after
/data is decrypted and mounted.
BUG: 23428579
Change-Id: I8ef38662cb0e8f8ce4db8cd6deb19dd019108b30
| -rw-r--r-- | Android.mk | 29 | ||||
| -rw-r--r-- | init.weaved.rc | 8 |
2 files changed, 20 insertions, 17 deletions
@@ -108,12 +108,9 @@ LOCAL_REQUIRED_MODULES := \ buffet.json \ com.android.Weave.conf \ gcd.json \ + init.weaved.rc \ webservd \ -ifdef INITRC_TEMPLATE -LOCAL_REQUIRED_MODULES += init.weaved.rc -endif - LOCAL_CPP_EXTENSION := $(buffetCommonCppExtension) LOCAL_CFLAGS := $(buffetCommonCFlags) LOCAL_CPPFLAGS := $(buffetCommonCppFlags) @@ -128,19 +125,6 @@ LOCAL_SRC_FILES := \ include $(BUILD_EXECUTABLE) -ifdef INITRC_TEMPLATE -include $(CLEAR_VARS) -LOCAL_MODULE := init.weaved.rc -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_INITRCD) - -include $(BUILD_SYSTEM)/base_rules.mk - -.PHONY: $(LOCAL_BUILT_MODULE) -$(LOCAL_BUILT_MODULE): $(INITRC_TEMPLATE) - $(call generate-initrc-file,weaved,,inet) -endif - # libweaved-client # ======================================================== include $(CLEAR_VARS) @@ -209,6 +193,17 @@ 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) diff --git a/init.weaved.rc b/init.weaved.rc new file mode 100644 index 0000000..a47d37f --- /dev/null +++ b/init.weaved.rc @@ -0,0 +1,8 @@ +on boot + mkdir /data/misc/weaved 0700 system system + +service weaved /system/bin/weaved + class late_start + user system + group system dbus inet + seclabel u:r:brillo:s0 |