diff options
| author | Elliott Hughes <enh@google.com> | 2012-12-03 13:59:52 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-12-03 13:59:53 -0800 |
| commit | 69985f92e2ce80184915655cd0d3dfea78a39900 (patch) | |
| tree | 6cf1698eb237cb6d6370fe1551f098fe1a791032 | |
| parent | 7c1599eaf8135729876344969bf8bd84f79cee24 (diff) | |
| parent | 5e7c23b6db620045c0429f4f49a190f45b12476b (diff) | |
| download | hamcrest-jb-mr1-dev-plus-aosp.tar.gz | |
Merge "Only build hamcrest-hostdex if WITH_HOST_DALVIK is true."android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1tools_r22.2tools_r22kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-dev-plus-aospjb-mr1-dev-plus-aosp
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -26,12 +26,14 @@ include $(BUILD_HOST_JAVA_LIBRARY) # build for the host dalvik # ------------------------- +ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_MODULE := hamcrest-hostdex LOCAL_MODULE_TAGS := optional LOCAL_BUILD_HOST_DEX := true include $(BUILD_HOST_JAVA_LIBRARY) +endif |