diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-23 19:56:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 19:56:13 +0000 |
| commit | 9fb9af468ed5e2ecba330348262dae5e04b7d006 (patch) | |
| tree | 3206b1c27054e151fb1986877d481b5a9b78c35c | |
| parent | 49358a1f2d21e23a985ab4fc385e6d40a15c2c79 (diff) | |
| parent | 8567823d024f160a2371bc89b822889aab0a7214 (diff) | |
| download | hamcrest-marshmallow-mr3-release.tar.gz | |
am 8567823d: Merge "Delete obsolete hamcrest-hostdex rule."android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1afw-test-harness-1.5marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-release
* commit '8567823d024f160a2371bc89b822889aab0a7214':
Delete obsolete hamcrest-hostdex rule.
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -24,29 +24,15 @@ LOCAL_MODULE := hamcrest-host LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_JAVA_LIBRARY) -# build for the host dalvik -# ------------------------- -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_MODULE := hamcrest-hostdex -LOCAL_MODULE_TAGS := optional -include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) - - - #------------------------------- # build a target jar include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) - LOCAL_MODULE := hamcrest - LOCAL_SDK_VERSION := 4 - LOCAL_MODULE_TAGS := optional - include $(BUILD_STATIC_JAVA_LIBRARY) include $(call all-makefiles-under, $(LOCAL_PATH)) |