From cc1e4cfb6eb29a1364a81568ced615abc3dd6ca9 Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 23 Dec 2019 10:27:45 +0900
Subject: [PATCH] Move group_system_ext and passwd_system_ext to
 base_system_ext.mk

As we have base_system_ext.mk for the packages in system_ext
partition, move the group and passwd files for system_ext partition
to base_system_ext.mk.

Bug: 141658360
Test: mainline checks pass
Change-Id: Iff50482b90ff9877a58c54c8149014e8c103a3c6
---
 target/product/base_system_ext.mk | 2 ++
 target/product/base_vendor.mk     | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/product/base_system_ext.mk b/target/product/base_system_ext.mk
index df859cd4c..6847bfa40 100644
--- a/target/product/base_system_ext.mk
+++ b/target/product/base_system_ext.mk
@@ -16,3 +16,5 @@
 
 # Base modules and settings for the system_ext partition.
 PRODUCT_PACKAGES += \
+    group_system_ext \
+    passwd_system_ext \
diff --git a/target/product/base_vendor.mk b/target/product/base_vendor.mk
index 1657e7112..c49aab7c2 100644
--- a/target/product/base_vendor.mk
+++ b/target/product/base_vendor.mk
@@ -49,7 +49,6 @@ PRODUCT_PACKAGES += \
     fs_config_dirs_nonsystem \
     gralloc.default \
     group_odm \
-    group_system_ext \
     group_vendor \
     init_vendor \
     libbundlewrapper \
@@ -65,7 +64,6 @@ PRODUCT_PACKAGES += \
     libril \
     libvisualizer \
     passwd_odm \
-    passwd_system_ext \
     passwd_vendor \
     selinux_policy_nonsystem \
     shell_and_utilities_vendor \