commit ebcbe0a151af3b07671e8d13fc7826dc94b38f23
author Paul Duffin <paulduffin@google.com> Wed Jan 10 17:49:53 2018 +0000
committer Paul Duffin <paulduffin@google.com> Wed Jan 10 17:49:53 2018 +0000
tree 2a26a282a6c6da6aaaf3be72cd68b47f22ab910f
parent eff6a2c39d745f7dea4f5ce8e97336b10e36e75e

Remove overlapping static and dynamic libraries

Adding libraries to both LOCAL_JAVA_LIBRARIES and
LOCAL_STATIC_JAVA_LIBRARIES creates duplicate classes which causes
problems for Proguard.

This change removes the duplicate libraries from LOCAL_JAVA_LIBRARIES
as they are not available at runtime.

Bug: 30188076
Test: make dist
Change-Id: I3bd37decc876844e99896960cb067e4300f6fd53

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 15de9b0..6c915a9 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := telephony-common android-support-test android.test.base
+LOCAL_JAVA_LIBRARIES := telephony-common android.test.base
 
 LOCAL_INSTRUMENTATION_FOR := TeleService