diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-01-04 14:44:07 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-01-05 14:43:21 -0800 |
| commit | a6cc893c4b142cd410fc956963b6f5a014e983ad (patch) | |
| tree | 72d9542065e45660c7b2f002a7c03dd9ad5a8a78 /test | |
| parent | 89521898b56f2ebc3fb68acfb6bc6dde9b6f5c38 (diff) | |
| download | art-a6cc893c4b142cd410fc956963b6f5a014e983ad.zip art-a6cc893c4b142cd410fc956963b6f5a014e983ad.tar.gz art-a6cc893c4b142cd410fc956963b6f5a014e983ad.tar.bz2 | |
Add installd support to dex2oat
Change-Id: Id1a64403ccea7dc2c1e8b8340d33d383d4045a33
Diffstat (limited to 'test')
| -rw-r--r-- | test/003-omnibus-opcodes/build | 2 | ||||
| -rw-r--r-- | test/023-many-interfaces/build | 2 | ||||
| -rw-r--r-- | test/056-const-string-jumbo/build | 2 | ||||
| -rw-r--r-- | test/085-old-style-inner-class/build | 2 | ||||
| -rwxr-xr-x | test/etc/default-build | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/test/003-omnibus-opcodes/build b/test/003-omnibus-opcodes/build index f3f56ac..4a9fd37 100644 --- a/test/003-omnibus-opcodes/build +++ b/test/003-omnibus-opcodes/build @@ -24,4 +24,4 @@ ${JAVAC} -d classes `find src2 -name '*.java'` dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex -dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat +dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat diff --git a/test/023-many-interfaces/build b/test/023-many-interfaces/build index c7d9c3b..896dba6 100644 --- a/test/023-many-interfaces/build +++ b/test/023-many-interfaces/build @@ -26,4 +26,4 @@ ${JAVAC} -d classes src/*.java dx --debug --dex --dump-to=classes.lst --output=classes.dex classes zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex -dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat +dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build index 325c02a..fde3b67 100644 --- a/test/056-const-string-jumbo/build +++ b/test/056-const-string-jumbo/build @@ -44,4 +44,4 @@ ${JAVAC} -d classes src/*.java dx -JXmx500m --debug --dex --no-optimize --positions=none --no-locals --dump-to=classes.lst --output=classes.dex classes zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex -dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat +dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat diff --git a/test/085-old-style-inner-class/build b/test/085-old-style-inner-class/build index 0497ad7..a7c0e25 100644 --- a/test/085-old-style-inner-class/build +++ b/test/085-old-style-inner-class/build @@ -26,4 +26,4 @@ ${JAVAC} -source 1.4 -target 1.4 -d classes `find src -name '*.java'` dx --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes 2>/dev/null zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex -dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat 2>/dev/null +dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat 2>/dev/null diff --git a/test/etc/default-build b/test/etc/default-build index ce1889e..d039b87 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -26,7 +26,7 @@ fi dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex -dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat +dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat if [ -r src-ex ]; then mkdir classes-ex @@ -37,7 +37,7 @@ if [ -r src-ex ]; then mv classes.dex classes-1.dex mv classes-ex.dex classes.dex zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar classes.dex - dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat + dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat mv classes.dex classes-ex.dex mv classes-1.dex classes.dex fi |