commit d6de726692d8a420faae86300bc9e87c30733730
author Brian Carlstrom <bdc@google.com> Wed Aug 01 11:05:06 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 01 11:05:06 2012 -0700
tree f4c0bec239b912bfca958274fe19464123fedb8c
parent 49e84ba2c2320883b2138ab4281a598c50a1a138
parent 24777f8a1c9df825d182f1765595bea57dca92ee

am 24777f8a: Merge "Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES."

* commit '24777f8a1c9df825d182f1765595bea57dca92ee':
  Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES.

Android.mk

diff --git a/Android.mk b/Android.mk
index b891356..e0da575 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,6 @@
 include $(CLEAR_VARS)
 
 LOCAL_JAVA_LIBRARIES := telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := jsr305
 LOCAL_SRC_FILES := $(call all-java-files-under, src/java)
 
 LOCAL_MODULE_TAGS := optional

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0177b23..4e463d6 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -40,6 +40,7 @@
 
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/mms-common_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/mms-common_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/mms-common_intermediates)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST