diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-10-12 14:31:45 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-10-12 14:37:20 -0700 |
| commit | 0796af03edc06d92bb8d631f1c0c23befdae2315 (patch) | |
| tree | c8681daeed4fb155b43d8a824e09a2fb973ff7fc /Android.mk | |
| parent | 1761ffc98298999f929e17cc3707aede5b890e0a (diff) | |
| download | art-0796af03edc06d92bb8d631f1c0c23befdae2315.zip art-0796af03edc06d92bb8d631f1c0c23befdae2315.tar.gz art-0796af03edc06d92bb8d631f1c0c23befdae2315.tar.bz2 | |
Fix Object::IsSoftReference
Also changed -Xzygote to default boot.art and log arguments
Finally Makefile work:
- separate out test dependencies
- changed zygote with art to work by replacing libdvm with libart[d]
- changed Makefile defines to name and error check their arguments
This was to fix bug in generating ART_TARGET_EXECUTABLES
where we used $(1) when we meant $(3)
Change-Id: I7ef6008eff1fe99b59d151b6793e8fd8ea5304d4
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 35 |
1 files changed, 26 insertions, 9 deletions
@@ -57,8 +57,11 @@ define run-host-tests-with $(foreach file,$(sort $(ART_HOST_TEST_EXECUTABLES)),$(1) $(file) &&) true endef -ART_HOST_TEST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(ART_HOST_TEST_EXECUTABLES) $(ANDROID_HOST_OUT)/framework/core-hostdex.jar $(ART_TEST_OAT_FILES) -ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(ART_TARGET_TEST_EXECUTABLES) $(ANDROID_PRODUCT_OUT)/system/framework/core.jar $(ART_TEST_OAT_FILES) +ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(ANDROID_HOST_OUT)/framework/core-hostdex.jar +ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(ANDROID_PRODUCT_OUT)/system/framework/core.jar + +ART_HOST_TEST_DEPENDENCIES := $(ART_HOST_DEPENDENCIES) $(ART_TEST_OAT_FILES) +ART_TARGET_TEST_DEPENDENCIES := $(ART_TARGET_DEPENDENCIES) $(ART_TEST_OAT_FILES) ART_TARGET_TEST_DEPENDENCIES += $(TARGET_OUT_EXECUTABLES)/oat_process $(TARGET_OUT_EXECUTABLES)/oat_processd @@ -165,20 +168,34 @@ test-art-target-oat-process-Calculator: $(TARGET_OUT_APPS)/Calculator.oat $(TARG ######################################################################## # zygote targets # -# zygote-oat-process will change to use art to boot the device -# zygote-app-process will restore to booting with dalvik +# zygote-artd will change to use art to boot the device with a debug build +# zygote-art will change to use art to boot the device with a production build +# zygote-dalvik will restore to booting with dalvik +# +# zygote-artd-target-sync will just push a new artd in place of dvm +# zygote-art-target-sync will just push a new art in place of dvm -.PHONY: zygote-oat-process -zygote-oat-process: $(TARGET_BOOT_OAT) test-art-target-sync - sed -e 's/app_process/oat_process/' -e 's/--start-system-server/--start-system-server --no-preload/' < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc +.PHONY: zygote-artd-target-sync +zygote-artd-target-sync: $(ART_TARGET_DEPENDENCIES) + cp $(ANDROID_PRODUCT_OUT)/system/lib/libartd.so $(ANDROID_PRODUCT_OUT)/system/lib/libdvm.so + cp $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libartd.so $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libdvm.so + adb remount + adb sync + +zygote-artd: $(TARGET_BOOT_OAT) zygote-artd-target-sync + sed 's/--start-system-server/--start-system-server --no-preload/' < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc rm -f $(ANDROID_PRODUCT_OUT)/boot.img unset ONE_SHOT_MAKEFILE && $(MAKE) showcommands bootimage adb reboot bootloader fastboot flash boot $(ANDROID_PRODUCT_OUT)/boot.img fastboot reboot -.PHONY: zygote-app-process -zygote-app-process: +.PHONY: zygote-dalvik +zygote-dalvik: + cp $(ANDROID_PRODUCT_OUT)/obj/lib/libdvm.so $(ANDROID_PRODUCT_OUT)/system/lib/libdvm.so + cp $(ANDROID_PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdvm_intermediates/LINKED/libdvm.so $(ANDROID_PRODUCT_OUT)/symbols/system/lib/libdvm.so + adb remount + adb sync cp system/core/rootdir/init.rc $(ANDROID_PRODUCT_OUT)/root/init.rc rm -f $(ANDROID_PRODUCT_OUT)/boot.img unset ONE_SHOT_MAKEFILE && $(MAKE) showcommands bootimage |