aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-01-19 14:13:48 -0800
committerColin Cross <ccross@android.com>2017-01-19 14:21:37 -0800
commit0afca749f46501e27a2b4eb40d2f7dd23634b697 (patch)
tree5efdb4796efb0d11c9d64f74396d7b09b0ee1038
parentb6e6f3ada89e108db7244c99a74cdd048d20dd01 (diff)
downloadguice-0afca749f46501e27a2b4eb40d2f7dd23634b697.tar.gz
Use BUILD_HOST_STATIC_DALVIK_JAVA_LIBRARY for guice-hostdexandroid-o-preview-1android-n-mr2-preview-2o-preview
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
-rw-r--r--Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index 44bbc4a4..b45bc715 100644
--- a/Android.mk
+++ b/Android.mk
@@ -89,7 +89,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := guava-hostdex jsr330-hostdex
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 #