summaryrefslogtreecommitdiffstats
path: root/JavaLibrary.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-05-22 11:05:31 -0700
committerBrian Carlstrom <bdc@google.com>2013-05-22 11:12:51 -0700
commit2cf03dc15c40b92634ff606694af5a6e9aa4db09 (patch)
tree35e908dd1d72be7f2adf401360aea9646760623c /JavaLibrary.mk
parent2efa673c6b6408b306b0372fdf37d232b29c2526 (diff)
downloadlibcore-2cf03dc15c40b92634ff606694af5a6e9aa4db09.zip
libcore-2cf03dc15c40b92634ff606694af5a6e9aa4db09.tar.gz
libcore-2cf03dc15c40b92634ff606694af5a6e9aa4db09.tar.bz2
Adding libart support to libcore
Change-Id: I86febf08eacf42bb4b2f06dbd51c5b2d5b25c9fb
Diffstat (limited to 'JavaLibrary.mk')
-rw-r--r--JavaLibrary.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index a28e609..0e57401 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -51,7 +51,13 @@ endef
# 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)