commit 6b815ae5609fb98446d1c8c3ab71bdcb70ae8ffd
author Paul Duffin <paulduffin@google.com> Fri Dec 16 14:59:28 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Dec 16 14:59:28 2016 +0000
tree a571ded780dc9c4fe0c1666851ffc21afed597c5
parent c8f84aac0c67214f057371d0e485f59453a33bbc
parent 4f6c59f4d3bf6db045969cd3c0c03af3936e0074

Merge "Remove reference to deleted file Common.mk" am: 8f7a4bf103 am: 3257b32ae5
am: 4f6c59f4d3

Change-Id: Ief5d910cf09204ebee5132911d5da3a39d48a4da

Android.mk

diff --git a/Android.mk b/Android.mk
index 1ecb3e6..b9171db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@
 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_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_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_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)