commit 49e55e879801441531b8d32d0472cd7c2f826b44
author Adam He <adamhe@google.com> Fri Oct 08 19:22:13 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 08 19:22:13 2021 +0000
tree df26b60517e8cb2deb8bb482e87317d60db1bab0
parent 94d474a4a10ed492756bfd8ba1bfb550a25b80c3
parent 7c02ce6f1c8220ee54141495aaa9e3182f4bd24e

Merge "Revert "Include CarManagedProvisioning in car.mk"" into sc-v2-dev

car_product/build/car.mk

diff --git a/car_product/build/car.mk b/car_product/build/car.mk
index 7700cca..67202f2 100644
--- a/car_product/build/car.mk
+++ b/car_product/build/car.mk
@@ -24,7 +24,6 @@
     CarActivityResolver \
     CarDeveloperOptions \
     CarSettingsIntelligence \
-    CarManagedProvisioning \
     OneTimeInitializer \
     CarProvision \
     StatementService \

car_product/build/car_base.mk

diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index c0d5190..4d3cf5e 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -42,6 +42,7 @@
     Keyguard \
     LatinIME \
     Launcher2 \
+    ManagedProvisioning \
     PacProcessor \
     PrintSpooler \
     ProxyHandler \