From e07a32b1246c8da7db16e8cd75892ed481bc71af Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Sat, 15 Dec 2018 15:08:48 -0800
Subject: [PATCH] Restore reverted CleanSpec

Ica006a007d112c232311435aaac0c0e476232b67 added a clean step that was
reverted in I0ce3ad70c73ff997aacaf411b0b5dc73760e7f91.  Reverting
a clean step could cause a future clean step to be skipped, because
Make only tracks how many clean steps have been run out of each
CleanSpec.mk file.  Add back the reverted clean step.

Bug: 119412419
Test: none
Change-Id: I11fe12d7c3526ccc21f468b350b4288cb55a9447
---
 CleanSpec.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 91e6e6605b..45ca7c18fa 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -525,6 +525,9 @@ $(call add-clean-step, rm -f $(HOST_OUT)/bin/aidegen)
 # Remove perfprofd
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/perfprofd)
 
+# Remove incorrectly created directories in the source tree
+$(call add-clean-step, find system/app system/priv-app system/framework system_other -depth -type d -print0 | xargs -0 rmdir)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************