diff options
| author | Ying Wang <wangying@google.com> | 2012-08-22 15:27:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-22 15:27:37 -0700 |
| commit | 3ea0a81c2bf2ad806a21c1df390751a4b68ebee1 (patch) | |
| tree | c855c5d85cd6a6b943b369af6781a123c51b0ab3 /core/java_library.mk | |
| parent | d1a9deeb9af69a2af638dc337d2fad03c1a37e7e (diff) | |
| parent | d19511a6657efc7f1a7e544df04f076223f8fe65 (diff) | |
| download | build-3ea0a81c2bf2ad806a21c1df390751a4b68ebee1.zip build-3ea0a81c2bf2ad806a21c1df390751a4b68ebee1.tar.gz build-3ea0a81c2bf2ad806a21c1df390751a4b68ebee1.tar.bz2 | |
am d19511a6: am c3a4cfe9: Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev
* commit 'd19511a6657efc7f1a7e544df04f076223f8fe65':
Support EMMA_INSTRUMENT in both full and unbundled builds.
Diffstat (limited to 'core/java_library.mk')
| -rw-r--r-- | core/java_library.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java_library.mk b/core/java_library.mk index 58d9ba6..6392108 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -44,6 +44,16 @@ ifeq (false,$(LOCAL_DEX_PREOPT)) LOCAL_DEX_PREOPT := endif +ifeq (true,$(EMMA_INSTRUMENT)) +ifeq (true,$(LOCAL_EMMA_INSTRUMENT)) +ifeq (true,$(EMMA_INSTRUMENT_STATIC)) +LOCAL_STATIC_JAVA_LIBRARIES += emma +endif # LOCAL_EMMA_INSTRUMENT +endif # EMMA_INSTRUMENT_STATIC +else +LOCAL_EMMA_INSTRUMENT := false +endif # EMMA_INSTRUMENT + ################################# include $(BUILD_SYSTEM)/java.mk ################################# |