commit 0afca749f46501e27a2b4eb40d2f7dd23634b697
author Colin Cross <ccross@android.com> Thu Jan 19 14:13:48 2017 -0800
committer Colin Cross <ccross@android.com> Thu Jan 19 14:21:37 2017 -0800
tree 5efdb4796efb0d11c9d64f74396d7b09b0ee1038
parent b6e6f3ada89e108db7244c99a74cdd048d20dd01

Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guice-hostdex

BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY must be used for libraries
that will be linked with LOCAL_STATIC_JAVA_LIBRARIES.

Test: m -j java
Change-Id: Ibf03dd9255882d472b6172602e74e8d9de981b1c

Android.mk

diff --git a/Android.mk b/Android.mk
index 44bbc4a..b45bc71 100644
--- a/Android.mk
+++ b/Android.mk
@@ -89,7 +89,7 @@
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 munge_src_arguments := $(guice_src_files)
 include $(LOCAL_PATH)/AndroidCallMunge.mk
-include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
+include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
 
 ###################################
 #           Munge                 #