commit 6f998b3e595e5c1df51ee8d80bd4d078c69e1e07
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 21 19:00:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jul 21 19:00:46 2017 +0000
tree 2427fbfce9a14f5f73fd7c55402311c1f8c08eb5
parent c35e698dfc396b2e016b1ed874c5a76cb5fd1676
parent 5771bdeffdc56e8a5cda7283583105ebc87cfce8

Merge changes from topic 'mke2fs_2'

* changes:
  ext4_utils: copy mke2fs.conf to /etc
  ext4_utils: copy mke2fs.conf to recovery /etc

ext4_utils/Android.mk

diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index e59eb4a..a80e473 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -102,4 +102,20 @@
 LOCAL_IS_HOST_MODULE := true
 include $(BUILD_PREBUILT)
 
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mke2fs.conf
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/etc
+include $(BUILD_PREBUILT)
+
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mke2fs.conf
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+include $(BUILD_PREBUILT)
+
 endif