diff options
| author | Tao Bao <tbao@google.com> | 2018-08-21 22:35:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-21 22:35:48 +0000 |
| commit | d561c2658df41d1699888b7220bb8ecd7a64e4d4 (patch) | |
| tree | 125d7365b37da608fdcfb01339e86cc53124ed1e | |
| parent | e485d92af6fa3cfa928d5d1b7071b5fc9b676596 (diff) | |
| parent | 6d5e43928c6e20d1828501e34346b7ce26c8f4d8 (diff) | |
| download | extras-d561c2658df41d1699888b7220bb8ecd7a64e4d4.tar.gz | |
Merge "Build mke2fs.conf with Android.bp."
| -rw-r--r-- | ext4_utils/Android.bp | 5 | ||||
| -rw-r--r-- | ext4_utils/Android.mk | 15 |
2 files changed, 5 insertions, 15 deletions
diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp index 6b2f863f..1e718887 100644 --- a/ext4_utils/Android.bp +++ b/ext4_utils/Android.bp @@ -81,5 +81,10 @@ python_binary_host { "mke2fs", "e2fsdroid", ], +} +prebuilt_etc { + name: "mke2fs.conf", + recovery_available: true, + src: "mke2fs.conf", } diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index ff36a251..cc24a53f 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -37,21 +37,6 @@ 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) - -include $(CLEAR_VARS) -LOCAL_MODULE := mke2fs.conf -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true include $(BUILD_PREBUILT) |