commit d4d039e87b31719c4180fef5be3faf258c14a3df
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 22 18:51:09 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 22 18:51:09 2024 +0000
tree 4c187d27ad6286ff9b8c9b70da9cbe4f17258c6e
parent 9aaed5b62696112eb291cde8a421548b6501a249
parent 64887d8cc8990402804928b20f37de55c17acaf7

Merge "Add tradeinmode to the system image." into main

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 74ed82d..4a27b7d 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -287,6 +287,7 @@
     tombstoned \
     traced \
     traced_probes \
+    tradeinmode \
     tune2fs \
     uiautomator \
     uinput \

target/product/generic/Android.bp

diff --git a/target/product/generic/Android.bp b/target/product/generic/Android.bp
index 93f7c36..c980959 100644
--- a/target/product/generic/Android.bp
+++ b/target/product/generic/Android.bp
@@ -536,6 +536,7 @@
         "tombstoned", // base_system
         "traced", // base_system
         "traced_probes", // base_system
+        "tradeinmode", // base_system
         "tune2fs", // base_system
         "uiautomator", // base_system
         "uinput", // base_system