Rename system folders from buffet/ to weaved/
Public file system locations mentioning buffet (e.g. /etc/buffet) are
now renamed to have references to "weaved".
BUG: 23418381
Change-Id: I11f48422b132353a8189ff08f4e94b2500df376a
diff --git a/Android.mk b/Android.mk
index 258126f..c7c167a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -207,34 +207,34 @@
include $(BUILD_EXECUTABLE)
-# Config files for /etc/buffet
+# Config files for /etc/weaved
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := base_state.defaults.json
LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/buffet
-LOCAL_SRC_FILES := buffet/etc/buffet/base_state.defaults.json
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved
+LOCAL_SRC_FILES := buffet/etc/weaved/base_state.defaults.json
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := base_state.schema.json
LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/buffet
-LOCAL_SRC_FILES := buffet/etc/buffet/base_state.schema.json
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved
+LOCAL_SRC_FILES := buffet/etc/weaved/base_state.schema.json
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := gcd.json
LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/buffet
-LOCAL_SRC_FILES := buffet/etc/buffet/gcd.json
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved
+LOCAL_SRC_FILES := buffet/etc/weaved/gcd.json
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE := buffet.json
LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/buffet/commands
-LOCAL_SRC_FILES := buffet/etc/buffet/commands/buffet.json
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/weaved/commands
+LOCAL_SRC_FILES := buffet/etc/weaved/commands/buffet.json
include $(BUILD_PREBUILT)
# DBus config files for /etc/dbus-1
diff --git a/buffet/etc/buffet/base_state.defaults.json b/buffet/etc/weaved/base_state.defaults.json
similarity index 100%
rename from buffet/etc/buffet/base_state.defaults.json
rename to buffet/etc/weaved/base_state.defaults.json
diff --git a/buffet/etc/buffet/base_state.schema.json b/buffet/etc/weaved/base_state.schema.json
similarity index 100%
rename from buffet/etc/buffet/base_state.schema.json
rename to buffet/etc/weaved/base_state.schema.json
diff --git a/buffet/etc/buffet/commands/buffet.json b/buffet/etc/weaved/commands/buffet.json
similarity index 100%
rename from buffet/etc/buffet/commands/buffet.json
rename to buffet/etc/weaved/commands/buffet.json
diff --git a/buffet/etc/buffet/commands/test.json b/buffet/etc/weaved/commands/test.json
similarity index 100%
rename from buffet/etc/buffet/commands/test.json
rename to buffet/etc/weaved/commands/test.json
diff --git a/buffet/etc/buffet/gcd.json b/buffet/etc/weaved/gcd.json
similarity index 100%
rename from buffet/etc/buffet/gcd.json
rename to buffet/etc/weaved/gcd.json
diff --git a/buffet/main.cc b/buffet/main.cc
index 350a905..203492b 100644
--- a/buffet/main.cc
+++ b/buffet/main.cc
@@ -54,8 +54,8 @@
namespace {
-const char kDefaultConfigFilePath[] = "/etc/buffet/buffet.conf";
-const char kDefaultStateFilePath[] = "/var/lib/buffet/device_reg_info";
+const char kDefaultConfigFilePath[] = "/etc/weaved/weaved.conf";
+const char kDefaultStateFilePath[] = "/var/lib/weaved/device_reg_info";
} // namespace
@@ -97,7 +97,7 @@
buffet::BuffetConfigPaths paths;
paths.defaults = base::FilePath{FLAGS_config_path};
paths.settings = base::FilePath{FLAGS_state_path};
- paths.definitions = base::FilePath{"/etc/buffet"};
+ paths.definitions = base::FilePath{"/etc/weaved"};
paths.test_definitions = base::FilePath{FLAGS_test_definitions_path};
weave::Device::Options options;