diff options
| -rw-r--r-- | test/004-ReferenceMap/build | 3 | ||||
| -rw-r--r-- | test/004-StackWalk/build | 3 | ||||
| -rw-r--r-- | test/022-interface/build | 2 | ||||
| -rwxr-xr-x | test/091-override-package-private-method/build | 4 | ||||
| -rw-r--r-- | test/111-unresolvable-exception/build | 2 | ||||
| -rw-r--r-- | test/113-multidex/build | 4 | ||||
| -rw-r--r-- | test/126-miranda-multidex/build | 4 | ||||
| -rwxr-xr-x | test/127-checker-secondarydex/build | 4 | ||||
| -rwxr-xr-x | test/138-duplicate-classes-check2/build | 4 | ||||
| -rwxr-xr-x | test/952-invoke-custom/build | 7 | ||||
| -rwxr-xr-x | test/979-const-method-handle/build | 7 | ||||
| -rwxr-xr-x | test/etc/default-build | 2 |
12 files changed, 17 insertions, 29 deletions
diff --git a/test/004-ReferenceMap/build b/test/004-ReferenceMap/build index 08987b556c..3bb63ca624 100644 --- a/test/004-ReferenceMap/build +++ b/test/004-ReferenceMap/build @@ -21,6 +21,5 @@ set -e # (see b/19467889) mkdir classes ${JAVAC} -d classes `find src -name '*.java'` -${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex \ - --dump-width=1000 ${DX_FLAGS} classes +${DX} -JXmx256m --debug --dex --output=classes.dex ${DX_FLAGS} classes zip $TEST_NAME.jar classes.dex diff --git a/test/004-StackWalk/build b/test/004-StackWalk/build index 08987b556c..3bb63ca624 100644 --- a/test/004-StackWalk/build +++ b/test/004-StackWalk/build @@ -21,6 +21,5 @@ set -e # (see b/19467889) mkdir classes ${JAVAC} -d classes `find src -name '*.java'` -${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex \ - --dump-width=1000 ${DX_FLAGS} classes +${DX} -JXmx256m --debug --dex --output=classes.dex ${DX_FLAGS} classes zip $TEST_NAME.jar classes.dex diff --git a/test/022-interface/build b/test/022-interface/build index f6aad91e97..ab1c822ebf 100644 --- a/test/022-interface/build +++ b/test/022-interface/build @@ -17,6 +17,6 @@ # Stop if something fails. set -e -${DX} --debug --dex --dump-to=classes.lst --output=classes.dex classes +${DX} --debug --dex --output=classes.dex classes zip $TEST_NAME.jar classes.dex diff --git a/test/091-override-package-private-method/build b/test/091-override-package-private-method/build index ea12b3a540..e5fa6693a3 100755 --- a/test/091-override-package-private-method/build +++ b/test/091-override-package-private-method/build @@ -24,8 +24,8 @@ mkdir classes-ex mv classes/OverridePackagePrivateMethodSuper.class classes-ex if [ ${NEED_DEX} = "true" ]; then - ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes + ${DX} -JXmx256m --debug --dex --output=classes.dex classes zip $TEST_NAME.jar classes.dex - ${DX} -JXmx256m --debug --dex --dump-to=classes-ex.lst --output=classes.dex --dump-width=1000 classes-ex + ${DX} -JXmx256m --debug --dex --output=classes.dex classes-ex zip ${TEST_NAME}-ex.jar classes.dex fi diff --git a/test/111-unresolvable-exception/build b/test/111-unresolvable-exception/build index 6fe73af8d8..f24c5b2004 100644 --- a/test/111-unresolvable-exception/build +++ b/test/111-unresolvable-exception/build @@ -22,6 +22,6 @@ ${JAVAC} -d classes `find src -name '*.java'` rm classes/TestException.class if [ ${NEED_DEX} = "true" ]; then - ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes + ${DX} -JXmx256m --debug --dex --output=classes.dex classes zip $TEST_NAME.jar classes.dex fi diff --git a/test/113-multidex/build b/test/113-multidex/build index f945563939..4ad7cb9134 100644 --- a/test/113-multidex/build +++ b/test/113-multidex/build @@ -29,9 +29,9 @@ rm classes2/Second.class classes2/FillerA.class classes2/FillerB.class classes2/ if [ ${NEED_DEX} = "true" ]; then # All except Main - ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes + ${DX} -JXmx256m --debug --dex --output=classes.dex classes # Only Main - ${DX} -JXmx256m --debug --dex --dump-to=classes2.lst --output=classes2.dex classes2 + ${DX} -JXmx256m --debug --dex --output=classes2.dex classes2 zip $TEST_NAME.jar classes.dex classes2.dex fi diff --git a/test/126-miranda-multidex/build b/test/126-miranda-multidex/build index cf19855316..b4bb88d644 100644 --- a/test/126-miranda-multidex/build +++ b/test/126-miranda-multidex/build @@ -29,9 +29,9 @@ rm classes2/Main.class classes2/MirandaAbstract.class classes2/MirandaClass*.cla if [ ${NEED_DEX} = "true" ]; then # All except Main - ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex classes + ${DX} -JXmx256m --debug --dex --output=classes.dex classes # Only Main - ${DX} -JXmx256m --debug --dex --dump-to=classes2.lst --output=classes2.dex classes2 + ${DX} -JXmx256m --debug --dex --output=classes2.dex classes2 zip $TEST_NAME.jar classes.dex classes2.dex fi diff --git a/test/127-checker-secondarydex/build b/test/127-checker-secondarydex/build index 712774f7ef..c23b7613b9 100755 --- a/test/127-checker-secondarydex/build +++ b/test/127-checker-secondarydex/build @@ -24,8 +24,8 @@ mkdir classes-ex mv classes/Super.class classes-ex if [ ${NEED_DEX} = "true" ]; then - ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes + ${DX} -JXmx256m --debug --dex --output=classes.dex classes zip $TEST_NAME.jar classes.dex - ${DX} -JXmx256m --debug --dex --dump-to=classes-ex.lst --output=classes.dex --dump-width=1000 classes-ex + ${DX} -JXmx256m --debug --dex --output=classes.dex classes-ex zip ${TEST_NAME}-ex.jar classes.dex fi diff --git a/test/138-duplicate-classes-check2/build b/test/138-duplicate-classes-check2/build index 76d535abf1..3ff15aae38 100755 --- a/test/138-duplicate-classes-check2/build +++ b/test/138-duplicate-classes-check2/build @@ -25,8 +25,8 @@ ${JAVAC} -d classes-ex `find src-ex -name '*.java'` rm classes-ex/A.class if [ ${NEED_DEX} = "true" ]; then - ${DX} -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes + ${DX} -JXmx256m --debug --dex --output=classes.dex classes zip ${TEST_NAME}.jar classes.dex - ${DX} -JXmx256m --debug --dex --dump-to=classes-ex.lst --output=classes.dex --dump-width=1000 classes-ex + ${DX} -JXmx256m --debug --dex --output=classes.dex classes-ex zip ${TEST_NAME}-ex.jar classes.dex fi diff --git a/test/952-invoke-custom/build b/test/952-invoke-custom/build index 2caca94d7f..53d8228808 100755 --- a/test/952-invoke-custom/build +++ b/test/952-invoke-custom/build @@ -21,11 +21,6 @@ ASM_JAR="${ANDROID_BUILD_TOP}/prebuilts/misc/common/asm/asm-6.0.jar" INTERMEDIATE_CLASSES=classes-intermediate CLASSES=classes -DEXER="${DX:-dx}" -if [ "${USE_D8=false}" = "true" ]; then - DEXER="${ANDROID_HOST_OUT}/bin/d8-compat-dx" -fi - # Create directory for intermediate classes rm -rf "${INTERMEDIATE_CLASSES}" mkdir "${INTERMEDIATE_CLASSES}" @@ -46,7 +41,7 @@ done # Create DEX DX_FLAGS="${DX_FLAGS} --min-sdk-version=26 --debug --dump-width=1000" -${DEXER} -JXmx256m --dex ${DX_FLAGS} --dump-to=${CLASSES}.lst --output=classes.dex ${CLASSES} +${DX} -JXmx256m --dex ${DX_FLAGS} --output=classes.dex ${CLASSES} # Zip DEX to file name expected by test runner zip ${TEST_NAME:-classes-dex}.jar classes.dex diff --git a/test/979-const-method-handle/build b/test/979-const-method-handle/build index ce931a96d1..67fc2a6339 100755 --- a/test/979-const-method-handle/build +++ b/test/979-const-method-handle/build @@ -22,11 +22,6 @@ INTERMEDIATE_CLASSES=classes-intermediate TRANSFORMER_CLASSES=classes-transformer CLASSES=classes -DEXER="${DX:-dx}" -if [ "${USE_D8=false}" = "true" ]; then - DEXER="${ANDROID_HOST_OUT}/bin/d8-compat-dx" -fi - # Create directories for classes for class_dir in "${INTERMEDIATE_CLASSES}" "${TRANSFORMER_CLASSES}" "${CLASSES}"; do rm -rf "${class_dir}" @@ -49,7 +44,7 @@ done # Create DEX DX_FLAGS="${DX_FLAGS} --min-sdk-version=28 --debug --dump-width=1000" -${DEXER} -JXmx256m --dex ${DX_FLAGS} --dump-to=${CLASSES}.lst --output=classes.dex ${CLASSES} ${TRANSFORMER_CLASSES} +${DX} -JXmx256m --dex ${DX_FLAGS} --output=classes.dex ${CLASSES} ${TRANSFORMER_CLASSES} # Zip DEX to file name expected by test runner zip ${TEST_NAME:-classes-dex}.jar classes.dex diff --git a/test/etc/default-build b/test/etc/default-build index 9dbc73c6b4..c8993c6611 100755 --- a/test/etc/default-build +++ b/test/etc/default-build @@ -307,7 +307,7 @@ function make_dex() { fi # Make dex file from desugared JAR. - ${dexer} -JXmx256m ${DX_VM_FLAGS} --debug --dex --dump-to=${name}.lst --output=${name}.dex --dump-width=1000 ${DX_FLAGS} "${dx_input}" + ${dexer} -JXmx256m ${DX_VM_FLAGS} --debug --dex --output=${name}.dex ${DX_FLAGS} "${dx_input}" } # Merge all the dex files in $1..$N into $1. Skip non-existing files, but at least 1 file must exist. |