ART: Remove DX listing flags from test scripts
Bug: 110150973
Test: art/test.py --host -r
Change-Id: I25da0018ea21727dd85d82fe0840c0ab806e3d3d
diff --git a/test/004-ReferenceMap/build b/test/004-ReferenceMap/build
index 08987b5..3bb63ca 100644
--- a/test/004-ReferenceMap/build
+++ b/test/004-ReferenceMap/build
@@ -21,6 +21,5 @@
# (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 08987b5..3bb63ca 100644
--- a/test/004-StackWalk/build
+++ b/test/004-StackWalk/build
@@ -21,6 +21,5 @@
# (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 f6aad91..ab1c822 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 ea12b3a..e5fa669 100755
--- a/test/091-override-package-private-method/build
+++ b/test/091-override-package-private-method/build
@@ -24,8 +24,8 @@
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 6fe73af..f24c5b2 100644
--- a/test/111-unresolvable-exception/build
+++ b/test/111-unresolvable-exception/build
@@ -22,6 +22,6 @@
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 f945563..4ad7cb9 100644
--- a/test/113-multidex/build
+++ b/test/113-multidex/build
@@ -29,9 +29,9 @@
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 cf19855..b4bb88d 100644
--- a/test/126-miranda-multidex/build
+++ b/test/126-miranda-multidex/build
@@ -29,9 +29,9 @@
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 712774f..c23b761 100755
--- a/test/127-checker-secondarydex/build
+++ b/test/127-checker-secondarydex/build
@@ -24,8 +24,8 @@
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 76d535a..3ff15aa 100755
--- a/test/138-duplicate-classes-check2/build
+++ b/test/138-duplicate-classes-check2/build
@@ -25,8 +25,8 @@
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 2caca94..53d8228 100755
--- a/test/952-invoke-custom/build
+++ b/test/952-invoke-custom/build
@@ -21,11 +21,6 @@
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 @@
# 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 ce931a9..67fc2a6 100755
--- a/test/979-const-method-handle/build
+++ b/test/979-const-method-handle/build
@@ -22,11 +22,6 @@
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 @@
# 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 9dbc73c..c8993c6 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -307,7 +307,7 @@
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.