diff options
| author | buzbee <buzbee@google.com> | 2011-10-16 12:54:20 -0700 |
|---|---|---|
| committer | buzbee <buzbee@google.com> | 2011-10-16 12:54:20 -0700 |
| commit | 9b27e1c213d72f59f8ac760cb7a25fbaa5a66059 (patch) | |
| tree | c6732da009349e308f0a53275be4a530250111f0 /test | |
| parent | 3b6baaa203fa63f1522b2172a1645f90412afdae (diff) | |
| download | art-9b27e1c213d72f59f8ac760cb7a25fbaa5a66059.zip art-9b27e1c213d72f59f8ac760cb7a25fbaa5a66059.tar.gz art-9b27e1c213d72f59f8ac760cb7a25fbaa5a66059.tar.bz2 | |
art/test build fixes
Some of the old Dalvik tests have custom build rules - changed to
support new location of core.art in data/art-test.
Change-Id: I4a84c299e99c3567d8afe4f76e23a35ae26b754e
Diffstat (limited to 'test')
| -rw-r--r-- | test/003-omnibus-opcodes/build | 8 | ||||
| -rw-r--r-- | test/023-many-interfaces/build | 8 | ||||
| -rw-r--r-- | test/085-old-style-inner-class/build | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/test/003-omnibus-opcodes/build b/test/003-omnibus-opcodes/build index 6ee341b..47abae2 100644 --- a/test/003-omnibus-opcodes/build +++ b/test/003-omnibus-opcodes/build @@ -23,10 +23,10 @@ rm classes/UnresClass.class ${JAVAC} -d classes `find src2 -name '*.java'` dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes -zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar classes.dex +zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex dex2oatd -Xms16m -Xmx16m \ - --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \ - --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \ - --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \ + --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 \ --host-prefix=${ANDROID_PRODUCT_OUT} diff --git a/test/023-many-interfaces/build b/test/023-many-interfaces/build index 88201a2..171eaae 100644 --- a/test/023-many-interfaces/build +++ b/test/023-many-interfaces/build @@ -25,10 +25,10 @@ mkdir classes ${JAVAC} -d classes src/*.java dx --debug --dex --dump-to=classes.lst --output=classes.dex classes -zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar classes.dex +zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex dex2oatd -Xms16m -Xmx16m \ - --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \ - --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \ - --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \ + --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 \ --host-prefix=${ANDROID_PRODUCT_OUT} diff --git a/test/085-old-style-inner-class/build b/test/085-old-style-inner-class/build index a08c98b..32f7a86 100644 --- a/test/085-old-style-inner-class/build +++ b/test/085-old-style-inner-class/build @@ -26,10 +26,10 @@ ${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}/system/framework/$TEST_NAME.jar classes.dex +zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex dex2oatd -Xms16m -Xmx16m \ - --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \ - --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \ - --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \ + --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 \ --host-prefix=${ANDROID_PRODUCT_OUT} |