Snap for 5050829 from ade5819f to q-keystone-qcom-release

Change-Id: I57eb22dd3f80d9215147669e78b9ddba5a341da3

Snap for 5050829 from ade5819f to q-keystone-qcom-release
Change-Id: I57eb22dd3f80d9215147669e78b9ddba5a341da3
7eddd4ae · Android Build Role Account android-build-prod · 8d2872f2 · ade5819f · 7eddd4ae · 7eddd4ae
Commit 7eddd4ae authored 6 years ago by Android Build Role Account android-build-prod
--- 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)