From 15fd20f8737bf57829c399cfbc75dded6f30e9c3 Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Thu, 12 Dec 2019 15:04:48 -0800
Subject: [PATCH] Remove PermissionController from base_system after moving
 into APEX.

Bug: 136503238
Test: m mts && mts-tradefed run mts-permission
Change-Id: Ic6194402adfa1d0b8bd55e337e3b573ea37f7fba
---
 CleanSpec.mk                  | 3 +++
 target/product/base_system.mk | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 8a1a2aa5ab..c8631ee059 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -733,6 +733,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/apex/com.android.apex.cts.sh
 $(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_recovery*" -print0 | xargs -0 rm -rf)
 $(call add-clean-step, find $(SOONG_OUT_DIR)/.intermediates -type d -name "android_*_vendor*" -print0 | xargs -0 rm -rf)
 
+# Remove PermissionController after moving into APEX
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/*PermissionController)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index f49aee9c06..691bbfd939 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -220,7 +220,6 @@ PRODUCT_PACKAGES += \
     PackageInstaller \
     passwd_system \
     perfetto \
-    PermissionController \
     ping \
     ping6 \
     platform.xml \