| commit | f59582c075560b273cd488dc06eaa3d8b13fc7f7 | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@google.com> | Tue Aug 18 10:39:22 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 10:39:22 2009 -0700 |
| tree | 187cf8fbb86d1588b02b975e0e764e37f54801e9 | |
| parent | 4e258387a5488ee92f247d15212989d0e0de82f5 [diff] | |
| parent | 9285a86b311cdfe573e1326590ffd2ca90200b4b [diff] |
am 9285a86b: Change emma to be optional build target. Merge commit '9285a86b311cdfe573e1326590ffd2ca90200b4b' into eclair * commit '9285a86b311cdfe573e1326590ffd2ca90200b4b': Change emma to be optional build target.
diff --git a/Android.mk b/Android.mk index 7112f66..102f435 100644 --- a/Android.mk +++ b/Android.mk
@@ -7,6 +7,8 @@ LOCAL_MODULE := emma +LOCAL_MODULE_TAGS := optional + LOCAL_JAVA_RESOURCE_DIRS := core/res LOCAL_NO_EMMA_INSTRUMENT := true