Skip to content
Snippets Groups Projects
Commit ade5819f authored by Bill Peckham's avatar Bill Peckham
Browse files

Merge QP1A.180918.001 

Change-Id: If25687069bd5de283d282797108eb66edd391ddd
parents d45b03e0 382be7cf
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Android.bp
+ 3
− 3
View file @ ade5819f
...@@ -18,9 +18,9 @@ java_library_host { ...@@ -18,9 +18,9 @@ java_library_host {
srcs: [ "src/**/*.java" ], srcs: [ "src/**/*.java" ],
static_libs: [ libs: [
"guava-18.0-prebuilt", "guava",
"json-prebuilt",
"junit", "junit",
"json-prebuilt",
], ],
} }
tests/Android.mk
+ 1
− 2
View file @ ade5819f
...@@ -24,8 +24,7 @@ LOCAL_JAVACFLAGS += -g -Xlint ...@@ -24,8 +24,7 @@ LOCAL_JAVACFLAGS += -g -Xlint
LOCAL_MODULE := loganalysis-tests LOCAL_MODULE := loganalysis-tests
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := easymock junit-host LOCAL_JAVA_LIBRARIES := loganalysis json-prebuilt junit-host easymock
LOCAL_JAVA_LIBRARIES := loganalysis
include $(BUILD_HOST_JAVA_LIBRARY) include $(BUILD_HOST_JAVA_LIBRARY)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment