commit 5f84cf727ba4c87d9b305f5c8cc25f50345c24cf
author Cole Faust <colefaust@google.com> Tue Nov 12 15:15:30 2024 -0800
committer Cole Faust <colefaust@google.com> Wed Nov 13 11:14:59 2024 -0800
tree fc7c2bc446626e94621184e1f86aa3574eb53f80
parent 96c5cf80591aa9779cc7860b0f56a7ffc7a79abf

Build ramdisk's build.prop with soong

Following the same pattern as existing soong build.props.

Bug: 378146476
Test: Diff'd out/target/product/vsoc_x86_64/ramdisk/system/etc/ramdisk/build.prop before and after this cl
Change-Id: I41503a0f8d8d0041b9975ae42b376026b4437db4

core/sysprop.mk

diff --git a/core/sysprop.mk b/core/sysprop.mk
index 9b70d1c..255b699 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -301,22 +301,12 @@
 
 INSTALLED_SYSTEM_EXT_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_EXT)/etc/build.prop
 
-# ----------------------------------------------------------------
-# ramdisk/boot/etc/build.prop
-#
-
 RAMDISK_BUILD_PROP_REL_PATH := system/etc/ramdisk/build.prop
+ifeq (true,$(BOARD_USES_RECOVERY_AS_BOOT))
+INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RECOVERY_ROOT_OUT)/first_stage_ramdisk/$(RAMDISK_BUILD_PROP_REL_PATH)
+else
 INSTALLED_RAMDISK_BUILD_PROP_TARGET := $(TARGET_RAMDISK_OUT)/$(RAMDISK_BUILD_PROP_REL_PATH)
-$(eval $(call build-properties,\
-    bootimage,\
-    $(INSTALLED_RAMDISK_BUILD_PROP_TARGET),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty)))
-
-$(eval $(call declare-1p-target,$(INSTALLED_RAMDISK_BUILD_PROP_TARGET)))
+endif
 
 ALL_INSTALLED_BUILD_PROP_FILES := \
   $(INSTALLED_BUILD_PROP_TARGET) \

target/product/generic_ramdisk.mk

diff --git a/target/product/generic_ramdisk.mk b/target/product/generic_ramdisk.mk
index 388b180..5ecb55f 100644
--- a/target/product/generic_ramdisk.mk
+++ b/target/product/generic_ramdisk.mk
@@ -23,6 +23,7 @@
 PRODUCT_PACKAGES += \
     init_first_stage \
     snapuserd_ramdisk \
+    ramdisk-build.prop \
 
 # Debug ramdisk
 PRODUCT_PACKAGES += \