summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2012-08-01 11:05:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-01 11:05:06 -0700
commitd6de726692d8a420faae86300bc9e87c30733730 (patch)
treef4c0bec239b912bfca958274fe19464123fedb8c
parent49e84ba2c2320883b2138ab4281a598c50a1a138 (diff)
parent24777f8a1c9df825d182f1765595bea57dca92ee (diff)
downloadmms-d6de726692d8a420faae86300bc9e87c30733730.tar.gz
am 24777f8a: Merge "Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES."
* commit '24777f8a1c9df825d182f1765595bea57dca92ee': Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES.
-rw-r--r--Android.mk1
-rw-r--r--CleanSpec.mk1
2 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index b891356..e0da575 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,6 @@ LOCAL_PATH := $(call my-dir)
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
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