commit 86b26b7aaa4b79e0ab1e8c1b456311b41c4762ce
author Mathieu Chartier <mathieuc@google.com> Wed Jan 29 00:28:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 00:28:08 2014 +0000
tree 830b44f132cbda0bcc88f75a2af14d5a68032c11
parent d39083e4cb63a5274c56bbb966dea3d2b2bb5ef7
parent 8f4be93c8260b84d706d91586aff572791edd9fe

Merge "Visit libraries roots in JavaVMExt::VisitRoots"

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 3f9f9bf..10dc2d3 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -68,7 +68,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.oat.mk
 LOCAL_ADDITIONAL_DEPENDENCIES += $(HOST_CORE_IMG_OUT)
 include $(BUILD_PHONY_PACKAGE)
-endif
+endif # ART_BUILD_HOST
 
 # If we aren't building the host toolchain, skip building the target core.art.
 ifeq ($(WITH_HOST_DALVIK),true)
@@ -80,17 +80,5 @@
 LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.oat.mk
 LOCAL_ADDITIONAL_DEPENDENCIES += $(TARGET_CORE_IMG_OUT)
 include $(BUILD_PHONY_PACKAGE)
-endif
-
-ifeq ($(ART_BUILD_TARGET_NDEBUG),true)
-ifneq ($(PRODUCT_DEX_PREOPT_IMAGE_IN_DATA),true)
-include $(CLEAR_VARS)
-LOCAL_MODULE := boot.art
-LOCAL_MODULE_TAGS := optional
-LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
-LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.oat.mk
-LOCAL_ADDITIONAL_DEPENDENCIES += $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE)
-include $(BUILD_PHONY_PACKAGE)
-endif
-endif
-endif
+endif # ART_BUILD_TARGET
+endif # WITH_HOST_DALVIK