Specify LOCAL_INSTALLED_MODULE_STEM for prebuilt_etc.
Otherwise the recovery variant gets installed with `.recovery` suffix.
Bug: 112780007
Test: Build with the mke2fs.conf change (using Android.bp to install
mke2fs.conf). Check the installed filenames (under normal boot and
recovery both).
Change-Id: I882be2fa07b530667a2dafc2bfe18730a42c4c08
diff --git a/android/prebuilt_etc.go b/android/prebuilt_etc.go
index 12fefab..046512f 100644
--- a/android/prebuilt_etc.go
+++ b/android/prebuilt_etc.go
@@ -103,6 +103,7 @@
fmt.Fprintln(w, "LOCAL_MODULE_TAGS := optional")
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", p.sourceFilePath.String())
fmt.Fprintln(w, "LOCAL_MODULE_PATH :=", "$(OUT_DIR)/"+p.installDirPath.RelPathString())
+ fmt.Fprintln(w, "LOCAL_INSTALLED_MODULE_STEM :=", name)
if p.additionalDependencies != nil {
fmt.Fprint(w, "LOCAL_ADDITIONAL_DEPENDENCIES :=")
for _, path := range *p.additionalDependencies {