Merge "Consolidate loganalysis and tradefed build rules"

a30353f9 · Treehugger Robot · Gerrit Code Review · c5161757 · 975b7399 · a30353f9
Commit a30353f9 authored 6 years ago by Treehugger Robot Committed by Gerrit Code Review 6 years ago
--- 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",
  ],
 }
--- 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)