diff options
| author | Kevin Jin <kjin@google.com> | 2013-05-20 17:58:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-05-20 17:58:02 +0000 |
| commit | c9282aae22ba011bb8b49ff5796d18d65aac3cd6 (patch) | |
| tree | da3ad88c31aea0aff711be411b7906913ba6a142 | |
| parent | 0d7b67b43f83536708a6ae0330e739744049a48e (diff) | |
| parent | 3d2246f8b5b53fb4804eabb77c717c07f1119816 (diff) | |
| download | droiddriver-c9282aae22ba011bb8b49ff5796d18d65aac3cd6.tar.gz | |
Merge "don't put guava.jar in droiddriver.jar If put together and the app under test use a different version of guava, it may fail with IllegalAccessError: Class ref in pre-verified class resolved to unexpected implementation"
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3,7 +3,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := \ +LOCAL_JAVA_LIBRARIES := \ libguava13 LOCAL_MODULE := droiddriver @@ -22,4 +22,4 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ include $(BUILD_MULTI_PREBUILT) include $(call all-makefiles-under,$(LOCAL_PATH)) -include $(call all-makefiles-under,$(LOCAL_PATH)/samples)
\ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)/samples) |