diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-06-17 12:53:45 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-06-17 19:01:40 -0700 |
| commit | fa42b4410d49134a8e63dc2196be4013d286f2d6 (patch) | |
| tree | 71e325089092167f202fbdf763daaf700cfd4a4b /build/Android.executable.mk | |
| parent | 7675e16bcae06c0fe258aad89b3d511037dec399 (diff) | |
| download | art-fa42b4410d49134a8e63dc2196be4013d286f2d6.zip art-fa42b4410d49134a8e63dc2196be4013d286f2d6.tar.gz art-fa42b4410d49134a8e63dc2196be4013d286f2d6.tar.bz2 | |
Move to new art dalvikvm
Change-Id: Ib04bc9853b7084965fa0c9899c3e5f5ac42d4ce7
Diffstat (limited to 'build/Android.executable.mk')
| -rw-r--r-- | build/Android.executable.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index ee968a7..83a1706 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -89,6 +89,8 @@ define build-art-executable LOCAL_SHARED_LIBRARIES += libstlport endif + LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/build/Android.executable.mk + ifeq ($$(art_target_or_host),target) include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE) @@ -102,12 +104,10 @@ endef ifeq ($(ART_BUILD_TARGET_NDEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),target,ndebug)) $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),target,ndebug)) - $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),target,ndebug)) endif ifeq ($(ART_BUILD_TARGET_DEBUG),true) $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),target,debug)) $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),target,debug)) - $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),target,debug)) endif # We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target. @@ -120,9 +120,7 @@ endif ifeq ($(ART_BUILD_HOST_NDEBUG),true) $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),host,ndebug)) - $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,ndebug)) endif ifeq ($(ART_BUILD_HOST_DEBUG),true) $(eval $(call build-art-executable,oatdump,$(OATDUMP_SRC_FILES),host,debug)) - $(eval $(call build-art-executable,oatexec,$(OATEXEC_SRC_FILES),host,debug)) endif |