commit 274435657e4682e5cee3fffd11fb301ab32a828d
author Spandan Das <spandandas@google.com> Wed Nov 06 22:12:11 2024 +0000
committer Spandan Das <spandandas@google.com> Wed Nov 06 22:47:31 2024 +0000
tree afaede68b4635dcecafd4e83784a2e8606deac07
parent da5bff1c85e8dbf595429aa889b863d0b37bc421

Delete the build/install rules of dlkm build.prop from make

These will be built using soong modules. `build-properties` appends the
files to `ALL_DEFAULT_INSTALLED_MODULES`. Since we are no longer calling
`build-properties`, add the files directly to
`ALL_DEFAULT_INSTALLED_MODULES`.

Bug: 377562851
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug
Test: no diff in $PRODUCT_OUT/system_dlkm/etc/build.prop
$PRODUCT_OUT/vendor_dlkm/etc/build.prop
$PRODUCT_OUT/odm_dlkm/etc/build.prop (modulo timestamp diffs)
Test: no diff in file_list.txt of system_dlkm.img

Change-Id: Ibaa8b79216bfd27cff0c768637692fd4ea5d3b30

core/sysprop.mk

diff --git a/core/sysprop.mk b/core/sysprop.mk
index dc6f2c4..9b70d1c 100644
--- a/core/sysprop.mk
+++ b/core/sysprop.mk
@@ -281,51 +281,17 @@
 
 # ----------------------------------------------------------------
 # vendor_dlkm/etc/build.prop
-#
+# odm_dlkm/etc/build.prop
+# system_dlkm/build.prop
+# These are built by Soong. See build/soong/Android.bp
 
 INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_VENDOR_DLKM)/etc/build.prop
-$(eval $(call build-properties,\
-    vendor_dlkm,\
-    $(INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty)))
-
-$(eval $(call declare-1p-target,$(INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET)))
-
-# ----------------------------------------------------------------
-# odm_dlkm/etc/build.prop
-#
-
 INSTALLED_ODM_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM_DLKM)/etc/build.prop
-$(eval $(call build-properties,\
-    odm_dlkm,\
-    $(INSTALLED_ODM_DLKM_BUILD_PROP_TARGET),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty)))
-
-$(eval $(call declare-1p-target,$(INSTALLED_ODM_DLKM_BUILD_PROP_TARGET)))
-
-# ----------------------------------------------------------------
-# system_dlkm/build.prop
-#
-
 INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_SYSTEM_DLKM)/etc/build.prop
-$(eval $(call build-properties,\
-    system_dlkm,\
-    $(INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty),\
-    $(empty)))
-
-$(eval $(call declare-1p-target,$(INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET)))
+ALL_DEFAULT_INSTALLED_MODULES += \
+  $(INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET) \
+  $(INSTALLED_ODM_DLKM_BUILD_PROP_TARGET) \
+  $(INSTALLED_SYSTEM_DLKM_BUILD_PROP_TARGET) \
 
 # -----------------------------------------------------------------
 # system_ext/etc/build.prop