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

Commit 03904ae6 authored by Hung Nguyen's avatar Hung Nguyen Committed by Automerger Merge Worker
Browse files

Merge "Include init-mmd-prop.rc if mmd is not built" into main am: d66d5db0 

Original change: https://android-review.googlesource.com/c/platform/build/+/3529571



Change-Id: I6ff942f498f9c8624d48f92a0c5454c0ea7a1c21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd7519f6 d66d5db0

target/product/base_system.mk

+3 −0
Original line number Diff line number Diff line
@@ -385,6 +385,9 @@ endif 
ifeq ($(RELEASE_MEMORY_MANAGEMENT_DAEMON),true)

  PRODUCT_PACKAGES += \

        mm_daemon

else

  PRODUCT_PACKAGES += \

        init-mmd-prop.rc

endif



# VINTF data for system image

target/product/generic/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -698,7 +698,9 @@ system_image_defaults { 
        true: [

            "mm_daemon", // base_system (RELEASE_MEMORY_MANAGEMENT_DAEMON)

        ],

        default: [],

        default: [

            "init-mmd-prop.rc", // base_system

        ],

    }) + select(product_variable("debuggable"), {

        true: [

            "alloctop",