commit 3e65051393b621e341a17bb7bfcaef5c2dd6674a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Oct 10 02:12:59 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 10 02:12:59 2024 +0000
tree f945a9d6f6ee1986a1bfe919bbe3aa3670f36cba
parent ec96fdedcb56be47e70b10ed5989b30e51903cc6
parent 0afe300dbf22842df4e2bf0df7368e452905b184

Merge "Remove module llndk_in_system in build/make/target/product/gsi/Android.mk and add the required modules to auto-included-modules directly." into main am: 0afe300dbf

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

Change-Id: I4781a5dc9e6430332820ce5ca98f9f6d7981e204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

target/product/generic/Android.bp

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index c14fa17..06fccb6 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -581,6 +581,7 @@
                 "ContactsProvider", // base_system
                 "CredentialManager", // handheld_system
                 "DeviceAsWebcam", // handheld_system
+                "DeviceDiagnostics", // handheld_system - internal
                 "DocumentsUI", // handheld_system
                 "DownloadProvider", // base_system
                 "DownloadProviderUi", // handheld_system