summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-08-01 23:36:30 -0700
committerBrian Carlstrom <bdc@google.com>2013-08-01 23:36:30 -0700
commit3ca4ad72637fc0819d310e6bacc85d110521d673 (patch)
tree72a999725f5af787084ae1b40c8a363b539166b8 /Android.mk
parent4d00c09ea8f976dd5d4a82cf6c874abcd78e6f15 (diff)
downloadlibcore-3ca4ad72637fc0819d310e6bacc85d110521d673.zip
libcore-3ca4ad72637fc0819d310e6bacc85d110521d673.tar.gz
libcore-3ca4ad72637fc0819d310e6bacc85d110521d673.tar.bz2
Restore dalvik-host target to working order
Change-Id: I11e76580308e82e3e267439287690191fa2528d7
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index d12bafd..2e9b76e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -61,12 +61,14 @@ ifeq ($(WITH_HOST_DALVIK),true)
dalvik \
$(HOST_OUT)/bin/dalvikvm \
$(HOST_OUT)/bin/dexopt \
+ $(HOST_OUT)/lib/libconscrypt_jni.so \
$(HOST_OUT)/lib/libjavacore.so \
cacerts-host \
core-hostdex \
+ conscrypt-hostdex \
+ okhttp-hostdex \
bouncycastle-hostdex \
apache-xml-hostdex \
- okhttp-hostdex \
apache-harmony-tests-hostdex \
$(call intermediates-dir-for,JAVA_LIBRARIES,core-tests,,COMMON)/classes.jar
endif