diff options
| author | Ying Wang <wangying@google.com> | 2012-04-17 12:47:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-17 12:47:41 -0700 |
| commit | c62242988737e0204e6b01312faeda3b9a2b64cd (patch) | |
| tree | bd566a99666bee40939ec72da9e24ebef8b46337 | |
| parent | 78901bd6fdb0d3600a94f79b27c41224f7f5a241 (diff) | |
| parent | 7f17dff221008bad170ad266bca05db65a3888b9 (diff) | |
| download | junit-c62242988737e0204e6b01312faeda3b9a2b64cd.tar.gz | |
Merge "Fix Mac build."android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1tools_r21jb-releasejb-mr0-releasejb-dev
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -49,6 +49,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-junit include $(BUILD_JAVA_LIBRARY) +ifeq ($(WITH_HOST_DALVIK),true) # ---------------------------------- # build a core-junit-hostdex jar that contains exactly the same classes # as core-junit. @@ -67,3 +68,5 @@ LOCAL_MODULE := core-junit-hostdex LOCAL_BUILD_HOST_DEX := true include $(BUILD_HOST_JAVA_LIBRARY) +endif + |