diff options
| author | 2014-06-28 11:07:11 +0000 | |
|---|---|---|
| committer | 2014-06-26 18:33:52 +0000 | |
| commit | 7325d4734e3f5936ea7eef1d2a89cfa0622cbd9e (patch) | |
| tree | 7841f717da924c10f075ceaa13c81df8e1a7a99e | |
| parent | 3db4f0922ea9bf931a2393476278c8b18f852c9e (diff) | |
| parent | 44e37a5e1fcb8b10270b75a019b6e76bf3ae5d26 (diff) | |
Merge "Add the dalvikvm symlink to the art-host rule."
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index b1c2b8f4fd..14cd0f32ec 100644 --- a/Android.mk +++ b/Android.mk @@ -364,9 +364,9 @@ build-art-target: $(ART_TARGET_EXECUTABLES) $(ART_TARGET_GTEST_EXECUTABLES) $(TA # "m art-host" for just building the files needed to run the art script .PHONY: art-host ifeq ($(HOST_PREFER_32_BIT),true) -art-host: $(HOST_OUT_EXECUTABLES)/art $(HOST_OUT)/bin/dalvikvm32 $(HOST_OUT)/lib/libart.so $(HOST_OUT)/bin/dex2oat $(HOST_CORE_IMG_OUT) $(HOST_OUT)/lib/libjavacore.so +art-host: $(HOST_OUT_EXECUTABLES)/art $(HOST_OUT)/bin/dalvikvm32 $(HOST_OUT)/lib/libart.so $(HOST_OUT)/bin/dex2oat $(HOST_CORE_IMG_OUT) $(HOST_OUT)/lib/libjavacore.so $(HOST_OUT)/bin/dalvikvm else -art-host: $(HOST_OUT_EXECUTABLES)/art $(HOST_OUT)/bin/dalvikvm64 $(HOST_OUT)/bin/dalvikvm32 $(HOST_OUT)/lib/libart.so $(HOST_OUT)/bin/dex2oat $(HOST_CORE_IMG_OUT) $(HOST_OUT)/lib/libjavacore.so +art-host: $(HOST_OUT_EXECUTABLES)/art $(HOST_OUT)/bin/dalvikvm64 $(HOST_OUT)/bin/dalvikvm32 $(HOST_OUT)/lib/libart.so $(HOST_OUT)/bin/dex2oat $(HOST_CORE_IMG_OUT) $(HOST_OUT)/lib/libjavacore.so $(HOST_OUT)/bin/dalvikvm endif .PHONY: art-host-debug |