diff options
| author | Makoto Onuki <omakoto@google.com> | 2012-11-30 10:05:20 -0800 |
|---|---|---|
| committer | Makoto Onuki <omakoto@google.com> | 2012-11-30 10:05:20 -0800 |
| commit | aeb3751559dc6a8ed71a9463700941303cf44ba0 (patch) | |
| tree | 23b68899cfdf803e673339edf166775223df250f /CleanSpec.mk | |
| parent | 38ddedc8adfc4d58f4bebe4a51149e4768d42f70 (diff) | |
| parent | 9cd8c711a7ed0690e268fc930e6f8d0d594c17e5 (diff) | |
| download | frameworks_base-aeb3751559dc6a8ed71a9463700941303cf44ba0.zip frameworks_base-aeb3751559dc6a8ed71a9463700941303cf44ba0.tar.gz frameworks_base-aeb3751559dc6a8ed71a9463700941303cf44ba0.tar.bz2 | |
resolved conflicts for merge of 9cd8c711 to master
Change-Id: I5e2d13c44f6a0589648e5934c8c36790da85e828
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 53345f9..7836737 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -138,6 +138,8 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing2_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/ImageProcessing_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/ui/*.ogg) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.java) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/android/internal/telephony/IExtendedNetworkService.P) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |