diff options
| author | Chet Haase <chet@google.com> | 2013-09-04 17:19:44 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2013-09-04 17:19:44 -0700 |
| commit | 4918e7ad667eef019d231a9952cb9fda95ea927e (patch) | |
| tree | 85cfe3523494c82f3bbb86dfda47ad20055dd1fc /CleanSpec.mk | |
| parent | 79a5feff954b496de5c156a2f228b9cdda43cfa8 (diff) | |
| parent | 09ed0720288c8d4b97cfd182c630f142077854e9 (diff) | |
| download | frameworks_base-4918e7ad667eef019d231a9952cb9fda95ea927e.zip frameworks_base-4918e7ad667eef019d231a9952cb9fda95ea927e.tar.gz frameworks_base-4918e7ad667eef019d231a9952cb9fda95ea927e.tar.bz2 | |
resolved conflicts for merge of 09ed0720 to master
Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe
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 67e7907..368037c 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -176,6 +176,7 @@ $(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/print/IPrinterDiscoverySessionClient.*) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/os/IBattery*) $(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/android_stubs_current_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |