commit 9a2f306cf882fa186c3455ff4abb1ae3d28b891a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 13 19:29:27 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 13 19:29:27 2024 +0000
tree 4602c770c8091af5e26c9d6c6f9ab5c073e4f5c2
parent b25967bf3765bfe332b6bd15aaab116554bf3c70
parent cb96277416487a099debcdd7dca0e6f22fb302b2

Merge "Put DeviceDiagnostics on phones and tablets only" into main

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index e818019..0f94c55 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -82,7 +82,6 @@
     CtsShimPrivPrebuilt \
     debuggerd\
     device_config \
-    DeviceDiagnostics \
     dmctl \
     dnsmasq \
     dmesgd \

target/product/handheld_system.mk

diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk
index d706372..851ae8a 100644
--- a/target/product/handheld_system.mk
+++ b/target/product/handheld_system.mk
@@ -45,6 +45,7 @@
     CertInstaller \
     CredentialManager \
     DeviceAsWebcam \
+    DeviceDiagnostics \
     DocumentsUI \
     DownloadProviderUi \
     EasterEgg \