commit 2cf03dc15c40b92634ff606694af5a6e9aa4db09
author Brian Carlstrom <bdc@google.com> Wed May 22 11:05:31 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed May 22 11:12:51 2013 -0700
tree 35e908dd1d72be7f2adf401360aea9646760623c
parent 2efa673c6b6408b306b0372fdf37d232b29c2526

Adding libart support to libcore

Change-Id: I86febf08eacf42bb4b2f06dbd51c5b2d5b25c9fb

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index a28e609..0e57401 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -51,7 +51,13 @@
 
 # The Java files and their associated resources.
 core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni support xml)
+
+ifeq ($(WITH_ART),false)
 core_src_files += $(call all-main-java-files-under,libdvm)
+else
+core_src_files += $(call all-main-java-files-under,libart)
+endif
+
 core_resource_dirs := $(call all-core-resource-dirs,main)
 test_resource_dirs := $(call all-core-resource-dirs,test)