Merge "Consolidate loganalysis and tradefed build rules" am: a30353f9

am: b8e659ce

Change-Id: I5a73e71f8c473a5e0ed2bf9abe820046e319a9af

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",
   ],
 }

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)