Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27443565 authored by Spandan Das's avatar Spandan Das
Browse files

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
parent da5bff1c

core/sysprop.mk

+7 −41
Original line number Diff line number Diff line
@@ -281,51 +281,17 @@ INSTALLED_ODM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM)/etc/build.prop 


# ----------------------------------------------------------------

# vendor_dlkm/etc/build.prop

#



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

#

# These are built by Soong. See build/soong/Android.bp



INSTALLED_VENDOR_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_VENDOR_DLKM)/etc/build.prop

INSTALLED_ODM_DLKM_BUILD_PROP_TARGET := $(TARGET_OUT_ODM_DLKM)/etc/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