diff options
author | Bowgo Tsai <bowgotsai@google.com> | 2017-09-30 06:37:39 +0800 |
---|---|---|
committer | Bowgo Tsai <bowgotsai@google.com> | 2017-09-30 06:44:32 +0800 |
commit | 62398781f5a4ce32906cdbfc1ad8c34357e19eac (patch) | |
tree | 9156a5a5b80ac7132a5aae305e1badd7dc8cd59c /CleanSpec.mk | |
parent | f196067a8f2eb6d6efb02d1c05d698d7065e3b9e (diff) | |
parent | 73d9596bcd9103a92f51aae99f34f7b51366e76b (diff) | |
download | core-62398781f5a4ce32906cdbfc1ad8c34357e19eac.tar.gz core-62398781f5a4ce32906cdbfc1ad8c34357e19eac.tar.bz2 core-62398781f5a4ce32906cdbfc1ad8c34357e19eac.zip |
resolve merge conflicts of 73d9596bc to oc-mr1-dev-plus-aosp
Change-Id: I8272038fe905a88273ce9aa690af0ee0005a6b67
Diffstat (limited to 'CleanSpec.mk')
-rw-r--r-- | CleanSpec.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index d5b755461..e2e95778a 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -70,3 +70,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/secure-storage-unit-test $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/storageproxyd) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/tipc-test) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/trusty_keymaster_tipc) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/root) |