diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-12-16 14:33:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-16 14:33:18 +0000 |
| commit | 8f7a4bf1039370c7810bcfb287f6e0a6224f8063 (patch) | |
| tree | a571ded780dc9c4fe0c1666851ffc21afed597c5 /Android.mk | |
| parent | e0039d8613044647e77334281374d37b703d080a (diff) | |
| parent | 9882d0d4d348d0b4c222d2d13b337249f70156b2 (diff) | |
| download | junit-8f7a4bf1039370c7810bcfb287f6e0a6224f8063.tar.gz | |
Merge "Remove reference to deleted file Common.mk"
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -26,7 +26,7 @@ LOCAL_SDK_VERSION := 25 LOCAL_STATIC_JAVA_LIBRARIES := hamcrest # The following is needed by external/apache-harmony/jdwp/Android_debug_config.mk LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/junit -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) # build a junit-host jar @@ -37,7 +37,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) LOCAL_MODULE := junit-host LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-host -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_JAVA_LIBRARY) # build a junit-hostdex jar @@ -49,7 +49,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java) LOCAL_MODULE := junit-hostdex LOCAL_MODULE_TAGS := tests LOCAL_STATIC_JAVA_LIBRARIES := hamcrest-hostdex -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif # HOST_OS == linux @@ -61,5 +61,5 @@ LOCAL_MODULE := junit4-target LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 25 LOCAL_STATIC_JAVA_LIBRARIES := junit hamcrest -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/Common.mk +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_JAVA_LIBRARY) |