commit d66d5db0003619e5f0545daa249c3cb7513f263f
author Hung Nguyen <hungmn@google.com> Mon Mar 10 10:41:18 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 10 10:41:18 2025 -0700
tree 656f9946559da1254bfea0de7a57b7f49f4a0dc9
parent 0c86cc4e6f00653c92d2aabaca1b201de6189d12
parent cb69c6f22daa463c4793c8b68c56aefd4b10ab84

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

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index d699a26..3fe97ba 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -385,6 +385,9 @@
 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

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index e96983d..c90c61c 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -698,7 +698,9 @@
         true: [
             "mm_daemon", // base_system (RELEASE_MEMORY_MANAGEMENT_DAEMON)
         ],
-        default: [],
+        default: [
+            "init-mmd-prop.rc", // base_system
+        ],
     }) + select(product_variable("debuggable"), {
         true: [
             "alloctop",