Improve ART_BUILD_ disabling
Warn when builds are disabled
Disable .oat generation as appropriate
Change-Id: Ifee2bba943d8aa29ef543c7f552f6c8673aa4268
diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 7868204..b4e1266 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -63,11 +63,13 @@
$(TARGET_CORE_OAT_OUT): $(TARGET_CORE_IMG_OUT)
+ifeq ($(ART_BUILD_HOST),true)
include $(CLEAR_VARS)
LOCAL_MODULE := core.art-host
LOCAL_MODULE_TAGS := optional
LOCAL_ADDITIONAL_DEPENDENCIES := $(HOST_CORE_IMG_OUT)
include $(BUILD_PHONY_PACKAGE)
+endif
########################################################################
# The full system boot classpath
@@ -86,8 +88,10 @@
$(TARGET_BOOT_OAT_OUT): $(TARGET_BOOT_IMG_OUT)
+ifeq ($(ART_BUILD_TARGET),true)
include $(CLEAR_VARS)
LOCAL_MODULE := boot.art
LOCAL_MODULE_TAGS := optional
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_BOOT_IMG_OUT)
include $(BUILD_PHONY_PACKAGE)
+endif