diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-19 02:11:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-19 02:11:58 +0000 |
| commit | 191f8c8707a105d683fa0fa3ff6f645633f1d463 (patch) | |
| tree | f5bf82d37ddb8573112152f84a9a661c99ade8e9 | |
| parent | f6331e3cad22b26ae69399eb509af268ff1b6daa (diff) | |
| parent | 1a8486507e3feb42078ca2581404700a65110f0a (diff) | |
| download | junit-191f8c8707a105d683fa0fa3ff6f645633f1d463.tar.gz | |
am 1a848650: am 8f312e0c: Merge "Switch from core to core-libart"android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseandroid-live-tv-l-mr1
* commit '1a8486507e3feb42078ca2581404700a65110f0a':
Switch from core to core-libart
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -37,6 +37,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions) LOCAL_SRC_FILES += $(core-junit-files) LOCAL_SRC_FILES += $(junit-runner-files) LOCAL_MODULE := junit-targetdex # TODO: lose the suffix here and rename "junit" to "junit-hostdex" +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-libart LOCAL_MODULE_TAGS := tests LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/junit LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk @@ -61,7 +63,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src/junit/extensions) LOCAL_SRC_FILES += $(core-junit-files) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_LIBRARIES := core-libart LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-junit @@ -90,6 +92,8 @@ include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(junit-runner-files) LOCAL_MODULE := junit-runner +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-libart core-junit LOCAL_MODULE_TAGS := optional LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_STATIC_JAVA_LIBRARY) @@ -102,7 +106,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(junit-runner-files) LOCAL_MODULE := junit-runner-hostdex LOCAL_MODULE_TAGS := optional -LOCAL_JAVA_LIBRARIES := core-junit-hostdex +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core-libart-hostdex core-junit-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) |