diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-28 17:48:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-28 17:48:51 +0000 |
| commit | a30353f9c8c8f5eea72351854416dfff6741bb51 (patch) | |
| tree | 5e0ffb04259ad5aff3ae92bf059a7bb081ae9f18 | |
| parent | c5161757bad8e99dbdae12728fd8b96e5ced8830 (diff) | |
| parent | 975b739940f1c0db2f29ecef6c1dd55483155018 (diff) | |
| download | loganalysis-master-cuttlefish-testing-release.tar.gz | |
Merge "Consolidate loganalysis and tradefed build rules"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
| -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) |