ART: Retire desugar and dx in run-tests
Run-tests now use d8 for desugaring and dexing.
Build scripts no longer have hand written dexer invocations.
Bug: 110150973
Bug: 73711890
Test: art/test.py --host --64 -r
Test: art/test.py --target --prebuild --optimizing -r
Change-Id: Iae2199cf756624c1f045de7777c5ee6432398bd2
diff --git a/test/138-duplicate-classes-check2/build b/test/138-duplicate-classes-check2/build
index 3ff15aa..4ab7320 100755
--- a/test/138-duplicate-classes-check2/build
+++ b/test/138-duplicate-classes-check2/build
@@ -17,16 +17,22 @@
# Stop if something fails.
set -e
-mkdir classes
-${JAVAC} -d classes `find src -name '*.java'`
+export ORIGINAL_JAVAC="$JAVAC"
-mkdir classes-ex
-${JAVAC} -d classes-ex `find src-ex -name '*.java'`
-rm classes-ex/A.class
+# Wrapper function for javac which invokes the compiler and applies
+# additional setup steps for the test.
+function javac_wrapper {
+ set -e # Stop on error - the caller script may not have this set.
-if [ ${NEED_DEX} = "true" ]; then
- ${DX} -JXmx256m --debug --dex --output=classes.dex classes
- zip ${TEST_NAME}.jar classes.dex
- ${DX} -JXmx256m --debug --dex --output=classes.dex classes-ex
- zip ${TEST_NAME}-ex.jar classes.dex
-fi
+ $ORIGINAL_JAVAC "$@"
+
+ # Remove one A.class from classes-ex
+ rm -f classes-ex/A.class
+}
+
+export -f javac_wrapper
+export JAVAC=javac_wrapper
+
+######################################################################
+
+./default-build "$@"