Merge "Consolidate loganalysis and tradefed build rules"

am: a30353f9 Change-Id: Ic5386840b19abedc1640517c8ad4afe45ab362c3

Merge "Consolidate loganalysis and tradefed build rules"
am: a30353f9 Change-Id: Ic5386840b19abedc1640517c8ad4afe45ab362c3
b8e659ce · Julien Desprez · android-build-merger · ea57cd76 · a30353f9 · b8e659ce
Commit b8e659ce authored 6 years ago by Julien Desprez Committed by android-build-merger 6 years ago
--- a/Android.bp
+++ b/Android.bp
@@ -18,9 +18,9 @@ java_library_host {
  srcs: [ "src/**/*.java" ],
-  static_libs: [
+  libs: [
-    "guava-18.0-prebuilt",
+    "guava",
-    "json-prebuilt",
    "junit",
+    "json-prebuilt",
  ],
 }
--- 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 json-prebuilt junit-host easymock
-LOCAL_JAVA_LIBRARIES := loganalysis
 include $(BUILD_HOST_JAVA_LIBRARY)