Fix DexLimitTrackerTest: add missing deps, fix runfiles lookup, add missing test data. PiperOrigin-RevId: 936679295 Change-Id: I367788016cb43178b5614aaf6387fc7912047ba5
diff --git a/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD b/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD index 618bb5c..ba41664 100644 --- a/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD +++ b/src/tools/javatests/com/google/devtools/build/android/dexer/BUILD
@@ -29,7 +29,7 @@ "@androidsdk//:has_androidsdk": [ "DexFileSplitterTest.java", "DexLimitTrackerTest.java", - ], + ], "//conditions:default": ["NoAndroidSdkStubTest.java"], }), javacopts = ["-source 8 -target 8"], @@ -38,6 +38,7 @@ ":dexbuilder_import", "//src/tools/java/com/google/devtools/build/android/dexer:DexFileSplitter_lib", "//src/tools/java/com/google/devtools/build/android/r8:dexbuilder_deploy.jar", + "@com_android_dex//:dex", "@rules_android_maven//:com_google_guava_guava", "@rules_android_maven//:com_google_truth_truth", "@rules_android_maven//:junit_junit", @@ -97,7 +98,7 @@ outs = ["simple.srcjar"], cmd = """set -eu readonly tmpdir="$$(mktemp -d)" - echo "package base; public class SimpleClass { public int field; public void method() {} }" > "$${tmpdir}/SimpleClass.java" + echo "package base; public class SimpleClass { public int field; public void method() {} public void methodWithParams(int a, String b) {} }" > "$${tmpdir}/SimpleClass.java" $(location //tools/jdk:singlejar) --output $@ --resources "$${tmpdir}/SimpleClass.java:base/SimpleClass.java" rm -rf "$${tmpdir}" """, tools = ["//tools/jdk:singlejar"],
diff --git a/src/tools/javatests/com/google/devtools/build/android/dexer/DexLimitTrackerTest.java b/src/tools/javatests/com/google/devtools/build/android/dexer/DexLimitTrackerTest.java index 7e2faf6..1788198 100644 --- a/src/tools/javatests/com/google/devtools/build/android/dexer/DexLimitTrackerTest.java +++ b/src/tools/javatests/com/google/devtools/build/android/dexer/DexLimitTrackerTest.java
@@ -48,7 +48,7 @@ static { try { - Runfiles runfiles = Runfiles.preload().unmapped(); + Runfiles runfiles = Runfiles.create(); SIMPLE_JAR = getRunfile(runfiles, "simplejar"); FIELDS_TYPES_JAR = getRunfile(runfiles, "fields_types_jar"); } catch (Exception e) {