commit 650a6cfd4d6b2d38b88ada03694ae19cc448d07b
author Brian Carlstrom <bdc@google.com> Thu Jun 19 02:16:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 19 02:16:35 2014 +0000
tree 4de4df4cb315500e97047b8e5b401beba58e2fab
parent 1888a3a55a0a62629abf98eb5771ad3f55bb7ea1
parent 00ee83ff1bd827a852065986ed0da7a3ded57a55

am 00ee83ff: Merge "Switch from core to core-libart"

* commit '00ee83ff1bd827a852065986ed0da7a3ded57a55':
  Switch from core to core-libart

Android.mk

diff --git a/Android.mk b/Android.mk
index 2603ee0..9d4a221 100644
--- a/Android.mk
+++ b/Android.mk
@@ -22,7 +22,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(apache-xml_src_files)
 LOCAL_JAVACFLAGS := -encoding UTF-8
-LOCAL_JAVA_LIBRARIES := core
+LOCAL_JAVA_LIBRARIES := core-libart
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_RESOURCE_DIRS := src/main/java
 include $(BUILD_JAVA_LIBRARY)