diff --git a/Android.bp b/Android.bp index 7860d0793f442368f003ca55440d3b0b955de9ab..f7055c47dba088a34ad49519cee8c2ceeefe0efa 100644 --- a/Android.bp +++ b/Android.bp @@ -18,9 +18,9 @@ java_library_host { srcs: [ "src/**/*.java" ], - static_libs: [ - "guava-18.0-prebuilt", - "json-prebuilt", + libs: [ + "guava", "junit", + "json-prebuilt", ], } diff --git a/tests/Android.mk b/tests/Android.mk index 5b71e211c9b196788ca858e5deb0a1b85d5f8f66..8eda91688cd3cd9889fe125abc68e5246fb66e7f 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -24,8 +24,7 @@ LOCAL_JAVACFLAGS += -g -Xlint LOCAL_MODULE := loganalysis-tests LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := easymock junit-host -LOCAL_JAVA_LIBRARIES := loganalysis +LOCAL_JAVA_LIBRARIES := loganalysis json-prebuilt junit-host easymock include $(BUILD_HOST_JAVA_LIBRARY)