diff options
author | Kenny Root <kroot@google.com> | 2010-08-24 09:57:33 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2010-08-24 09:57:33 -0700 |
commit | 53e75ea847df20b29124966a4232dc0109c37e27 (patch) | |
tree | 4c545e0c93b0d50122002201d3f6836225a6b3dd /CleanSpec.mk | |
parent | d820714e30a53b244d252e77c7922e2c1604adbc (diff) | |
parent | 485de781f6bd30dfb7aa1e55c4f1efb3d3b11eba (diff) | |
download | frameworks_base-53e75ea847df20b29124966a4232dc0109c37e27.zip frameworks_base-53e75ea847df20b29124966a4232dc0109c37e27.tar.gz frameworks_base-53e75ea847df20b29124966a4232dc0109c37e27.tar.bz2 |
resolved conflicts for merge of 485de781 to master
Change-Id: I483cb81596f09b024b1aea7fc55960183f38b24f
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 f73e4d5..a9f4d19 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -76,6 +76,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhwui_interm $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libhwui.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/lib/libhwui.so) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libhwui.so) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/os/storage/*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST |