diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-10-04 00:56:06 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-10-04 10:39:42 -0700 |
| commit | 58ae9416e197ae68ed12ed43d87407d4dfb15093 (patch) | |
| tree | 9fa93ce844f931155bf4a1d060f091f3285fb205 /Android.mk | |
| parent | 4d0207c3ed28bbbb8c583a3c3a37f00d1cd4dedc (diff) | |
| download | art-58ae9416e197ae68ed12ed43d87407d4dfb15093.zip art-58ae9416e197ae68ed12ed43d87407d4dfb15093.tar.gz art-58ae9416e197ae68ed12ed43d87407d4dfb15093.tar.bz2 | |
Simplify command line arguments
Change-Id: I9d6902b0c447fd8fbe5600fd36139791b2ceefb7
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -113,7 +113,7 @@ test-art-target-run-test: test-art-target-run-test-002 @echo test-art-target-run-test PASSED .PHONY: test-art-target-run-test-002 -test-art-target-run-test-002: +test-art-target-run-test-002: test-art-target-sync art/test/run-test 002 @echo test-art-target-run-test-002 PASSED @@ -134,7 +134,7 @@ $(eval $(call build-art-framework-oat,$(TARGET_OUT_JAVA_LIBRARIES)/am.jar)) test-art-target-oat-process-am: $(TARGET_OUT_JAVA_LIBRARIES)/am.oat test-art-target-sync adb remount adb sync - adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Xbootimage:/system/framework/boot.art -Ximage:/system/framework/am.oat /system/bin com.android.commands.am.Am start http://android.com && touch /sdcard/test-art-target-process-am" + adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art -Ximage:/system/framework/am.oat /system/bin com.android.commands.am.Am start http://android.com && touch /sdcard/test-art-target-process-am" $(hide) (adb pull /sdcard/test-art-target-process-am /tmp/ && echo test-art-target-process-am PASSED) || echo test-art-target-process-am FAILED $(hide) rm /tmp/test-art-target-process-am @@ -158,7 +158,7 @@ test-art-target-oat-process-Calculator: $(TARGET_OUT_APPS)/Calculator.oat $(TARG sleep 30; \ fi adb shell kill `adb shell ps | fgrep com.android.calculator2 | sed -e 's/[^ ]* *\([0-9]*\).*/\1/'` - adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Xbootimage:/system/framework/boot.art -Ximage:/system/framework/am.oat /system/bin com.android.commands.am.Am start -a android.intent.action.MAIN -n com.android.calculator2/.Calculator && touch /sdcard/test-art-target-process-Calculator" + adb shell sh -c "export CLASSPATH=/system/framework/am.jar && oat_processd /system/bin/app_process -Ximage:/system/framework/boot.art -Ximage:/system/framework/am.oat /system/bin com.android.commands.am.Am start -a android.intent.action.MAIN -n com.android.calculator2/.Calculator && touch /sdcard/test-art-target-process-Calculator" $(hide) (adb pull /sdcard/test-art-target-process-Calculator /tmp/ && echo test-art-target-process-Calculator PASSED) || echo test-art-target-process-Calculator FAILED $(hide) rm /tmp/test-art-target-process-Calculator @@ -170,17 +170,17 @@ dump-oat: dump-oat-core dump-oat-boot dump-oat-Calculator .PHONY: dump-oat-core dump-oat-core: $(TARGET_CORE_OAT) $(OATDUMP) - $(OATDUMP) $(addprefix --dex-file=,$(TARGET_CORE_DEX)) --oat=$(TARGET_CORE_OAT) --image=$(TARGET_CORE_IMG) --strip-prefix=$(PRODUCT_OUT) --output=/tmp/core.oatdump.txt + $(OATDUMP) --image=$(TARGET_CORE_IMG) --host-prefix=$(PRODUCT_OUT) --output=/tmp/core.oatdump.txt @echo Output in /tmp/core.oatdump.txt .PHONY: dump-oat-boot dump-oat-boot: $(TARGET_BOOT_OAT) $(OATDUMP) - $(OATDUMP) $(addprefix --dex-file=,$(TARGET_BOOT_DEX)) --oat=$(TARGET_BOOT_OAT) --image=$(TARGET_BOOT_IMG) --strip-prefix=$(PRODUCT_OUT) --output=/tmp/boot.oatdump.txt + $(OATDUMP) --image=$(TARGET_BOOT_IMG) --host-prefix=$(PRODUCT_OUT) --output=/tmp/boot.oatdump.txt @echo Output in /tmp/boot.oatdump.txt .PHONY: dump-oat-Calculator dump-oat-Calculator: $(TARGET_OUT_APPS)/Calculator.oat $(TARGET_BOOT_OAT) $(OATDUMP) - $(OATDUMP) --dex-file=$(TARGET_OUT_APPS)/Calculator.apk --oat=$< --image=$(patsubst %.oat,%.art,$<) $(addprefix --boot-dex-file=,$(TARGET_BOOT_DEX)) --boot-oat=$(TARGET_BOOT_OAT) --boot-image=$(TARGET_BOOT_IMG) --strip-prefix=$(PRODUCT_OUT) --output=/tmp/Calculator.oatdump.txt + $(OATDUMP) --image=$(patsubst %.oat,%.art,$<) --boot-image=$(TARGET_BOOT_IMG) --host-prefix=$(PRODUCT_OUT) --output=/tmp/Calculator.oatdump.txt @echo Output in /tmp/Calculator.oatdump.txt |