commit f19a43cb2a68b58b6245a8d9fa551bf33649ba6a
author Julien Desprez <jdesprez@google.com> Tue Oct 23 09:32:16 2018 -0700
committer Julien Desprez <jdesprez@google.com> Tue Oct 23 09:36:04 2018 -0700
tree c72179b5365340166260d00464814183a02c89d3
parent cda9b34aace0d8697790440a30413d2060c48b02

Fix dependencies that are already available

Avoid statically linking dependencies when possible.

Test: run cts-unit-tests
run cts-dev -m CtsUnofficialApisUsageTestCases
run cts-dev -m CtsIncidentHostTestCases
run cts-dev -m CtsAppSecurityHostTestCases
run cts-dev -m CtsStatsdHostTestCases
Bug: 118297021
Change-Id: I643ff890ec0b88bd2d9e963c6aedf9e9536a79fc

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index b614cb1..0be6af6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -24,9 +24,7 @@
 
 LOCAL_MODULE := CtsStatsdHostTestCases
 
-LOCAL_PROTOC_OPTIMIZE_TYPE := full
-LOCAL_STATIC_JAVA_LIBRARIES := platformprotos
-LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util host-libprotobuf-java-full
+LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed compatibility-host-util host-libprotobuf-java-full platformprotos
 
 include $(BUILD_HOST_JAVA_LIBRARY)