commit a2133ee538ea28230bc5b98b65fc4a7d1bf8fa42
author Hung Nguyen <hungmn@google.com> Tue Oct 29 16:28:56 2024 -0700
committer Hung Nguyen <hungmn@google.com> Mon Nov 04 15:36:26 2024 -0800
tree 8444c114da864422f90bd49b33a5c167574de80c
parent 52b9b468461257a419326f1bdadcb50407cb98e3

Add mmd to the base system image

Bug: 370509309
Bug: 375432464
Test: m

Change-Id: I398fd6db66ac6cd22597f1456e8ecb98719baf52

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index eb4d497..8f2f7e3 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -350,6 +350,11 @@
         com.android.ranging
 endif
 
+ifeq ($(RELEASE_MEMORY_MANAGEMENT_DAEMON),true)
+  PRODUCT_PACKAGES += \
+        mm_daemon
+endif
+
 # VINTF data for system image
 PRODUCT_PACKAGES += \
     system_manifest.xml \

target/product/generic/Android.bp

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 84db9e1..017f8fb 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -563,6 +563,11 @@
             "trace_redactor", // base_system (RELEASE_PACKAGE_PROFILING_MODULE)
         ],
         default: [],
+    }) + select(release_flag("RELEASE_MEMORY_MANAGEMENT_DAEMON"), {
+        true: [
+            "mm_daemon", // base_system (RELEASE_MEMORY_MANAGEMENT_DAEMON)
+        ],
+        default: [],
     }) + select(product_variable("debuggable"), {
         true: [
             "adevice_fingerprint",