diff options
| author | Tao Bao <tbao@google.com> | 2018-08-14 22:16:01 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2018-08-20 18:27:37 -0700 |
| commit | 6d5e43928c6e20d1828501e34346b7ce26c8f4d8 (patch) | |
| tree | 05ae248bd16b1bc652d37c9b68a2a018590f8c36 /ext4_utils | |
| parent | 688d332824996cc78e217a9afd960d121497b623 (diff) | |
| download | extras-6d5e43928c6e20d1828501e34346b7ce26c8f4d8.tar.gz | |
Build mke2fs.conf with Android.bp.
Bug: 112780007
Test: Build with other changes in the topic (aosp_taimen-userdebug).
Test: Boot into recovery. Verify basic functionalities (`adb shell` and
`adb sideload`, factory reset).
Change-Id: Ic72c5bebf6c72373e67a483062dc160638c68a4e
Diffstat (limited to 'ext4_utils')
| -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) |