From 975b739940f1c0db2f29ecef6c1dd55483155018 Mon Sep 17 00:00:00 2001
From: Julien Desprez <jdesprez@google.com>
Date: Tue, 28 Aug 2018 09:00:32 -0700
Subject: Consolidate loganalysis and tradefed build rules

Save about 4MB of jar size by avoiding statically
shipping some library several times.

Test: make, unit tests
Bug: 77915666
Change-Id: Iec5b24d4f2d85159bf250eded431c8e89f40f7c1
---
 Android.bp       | 6 +++---
 tests/Android.mk | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 7860d07..f7055c4 100644
--- 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",
   ],
 }
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)
 
-- 
cgit v1.2.3