diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-01-28 16:05:27 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-01-28 16:05:27 -0800 |
| commit | 660f8f0d3c9b703660c683ce304eccce31fbf4dd (patch) | |
| tree | 46b9d17e3439f9626697906b3f98cb48417f794d /build/Android.oat.mk | |
| parent | be9e06c7b73c08b5ca00ebd913f8d8f4140e811d (diff) | |
| download | android_art-660f8f0d3c9b703660c683ce304eccce31fbf4dd.tar.gz android_art-660f8f0d3c9b703660c683ce304eccce31fbf4dd.tar.bz2 android_art-660f8f0d3c9b703660c683ce304eccce31fbf4dd.zip | |
Remove boot.art phony target
Change-Id: Idb1e22828567fa2c89c2e0057d5bc65a70ba2f32
Diffstat (limited to 'build/Android.oat.mk')
| -rw-r--r-- | build/Android.oat.mk | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 3f9f9bfea1..10dc2d3fd2 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -68,7 +68,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk 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.common.mk 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 |