From 2bf4726f18b9411ddb538526ba38e7c2ad82cab4 Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Fri, 14 Feb 2020 16:56:16 -0800
Subject: [PATCH] Shipping >= API Level 30: no vndservicemanager.

Make this device configuration instead. Vendor implementations can
choose to use this, but it's not required.

Bug: 148807371
Test: TH will test CF boots
Change-Id: Ic144b1aa36e35295fccd9fa7f7f911587bf39bee
---
 target/product/base_vendor.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 469e2313ee..b3368d694d 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -67,11 +67,11 @@ PRODUCT_PACKAGES += \
     selinux_policy_nonsystem \
     shell_and_utilities_vendor \
     vndservice \
-    vndservicemanager \
 
 # Base module when shipping api level is less than or equal to 29
 PRODUCT_PACKAGES_SHIPPING_API_LEVEL_29 += \
     android.hardware.configstore@1.1-service \
+    vndservicemanager \
 
 # VINTF data for vendor image
 PRODUCT_PACKAGES += \