diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-08-20 18:18:14 -0700 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2013-08-20 18:18:14 -0700 |
| commit | 605775c4edc6888e377d3f423c3b358b7b26565f (patch) | |
| tree | b0f87dbdab27b74216aaf6b15040e7251982fb8a /CleanSpec.mk | |
| parent | 6fd5e5503b6a7e557503b837c0d9a3967bcb1abf (diff) | |
| parent | ba35cf7a888931d2f53a7ffd767918579af5d334 (diff) | |
| download | frameworks_base-605775c4edc6888e377d3f423c3b358b7b26565f.zip frameworks_base-605775c4edc6888e377d3f423c3b358b7b26565f.tar.gz frameworks_base-605775c4edc6888e377d3f423c3b358b7b26565f.tar.bz2 | |
resolved conflicts for merge of ba35cf7a to master
Change-Id: Id9e6fa12056fc6cef7b77c70c73591dfc82e70a9
Diffstat (limited to 'CleanSpec.mk')
| -rw-r--r-- | CleanSpec.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index ebf5de9..065a7b8 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -172,6 +172,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/printservice/) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/packages/services/Proxy/) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrinterDiscoverySessionObserver.*) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrinterDiscoverySessionClient.*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |