diff options
| author | Julien Desprez <jdesprez@google.com> | 2018-08-28 13:14:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-28 13:14:36 -0700 |
| commit | 9beff5c271c895e43627f301d127256db9e7b506 (patch) | |
| tree | 5e0ffb04259ad5aff3ae92bf059a7bb081ae9f18 | |
| parent | ebf6e834d8ba7412c54b9dc3ea863c1decdc66b7 (diff) | |
| parent | b8e659ce2f206b958b204a9cb7d1cc9cecdf8789 (diff) | |
| download | loganalysis-9beff5c271c895e43627f301d127256db9e7b506.tar.gz | |
Merge "Consolidate loganalysis and tradefed build rules" am: a30353f9c8
am: b8e659ce2f
Change-Id: I5a73e71f8c473a5e0ed2bf9abe820046e319a9af
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | tests/Android.mk | 3 |
2 files changed, 4 insertions, 5 deletions
@@ -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 5b71e21..8eda916 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) |