summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrett Chabot <brettchabot@google.com>2009-08-18 10:39:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-08-18 10:39:22 -0700
commitf59582c075560b273cd488dc06eaa3d8b13fc7f7 (patch)
tree187cf8fbb86d1588b02b975e0e764e37f54801e9
parent4e258387a5488ee92f247d15212989d0e0de82f5 (diff)
parent9285a86b311cdfe573e1326590ffd2ca90200b4b (diff)
downloademma-f59582c075560b273cd488dc06eaa3d8b13fc7f7.tar.gz
am 9285a86b: Change emma to be optional build target.
Merge commit '9285a86b311cdfe573e1326590ffd2ca90200b4b' into eclair * commit '9285a86b311cdfe573e1326590ffd2ca90200b4b': Change emma to be optional build target.
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 7112f66..102f435 100644
--- a/Android.mk
+++ b/Android.mk
@@ -7,6 +7,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, core)
LOCAL_MODULE := emma
+LOCAL_MODULE_TAGS := optional
+
LOCAL_JAVA_RESOURCE_DIRS := core/res
LOCAL_NO_EMMA_INSTRUMENT := true