Skip to content

Fix dexer test #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ted-xie wants to merge 2 commits into from
+33 −7
Closed

Fix dexer test #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b98b85d
Fix dexer test
ted-xie Apr 8, 2026
adad70c
augment test to also work in google3
ted-xie Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/tools/javatests/com/google/devtools/build/android/dexer/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@ java_test(
size = "small",
srcs = ["AllTests.java"],
data = [
":fields_types_jar",
":jsimple_jar",
":multidex_jar",
":simple_jar",
],
jvm_flags = [
"-Djsimplejar=google3/$(location :jsimple_jar)",
"-Dmultidexjar=google3/$(location :multidex_jar)",
"-Dsimplejar=google3/$(location :simple_jar)",
"-Dfields_types_jar=$(location :fields_types_jar)",
"-Djsimplejar=$(location :jsimple_jar)",
"-Dmultidexjar=$(location :multidex_jar)",
"-Dsimplejar=$(location :simple_jar)",
],
runtime_deps = [
":tests",
Expand Down
32 changes: 28 additions & 4 deletions src/tools/javatests/com/google/devtools/build/android/dexer/DexFileSplitterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,39 @@ public class DexFileSplitterTest {
Runfiles runfiles = Runfiles.create();

// Look in the BUILD file for the corresponding genrules that codegen these jars.
SIMPLE_JAR = Paths.get(runfiles.rlocation(System.getProperty("simplejar")));
MULTIDEX_JAR = Paths.get(runfiles.rlocation(System.getProperty("multidexjar")));
JSIMPLE_JAR = Paths.get(runfiles.rlocation(System.getProperty("jsimplejar")));
FIELDS_TYPES_JAR = Paths.get(runfiles.rlocation(System.getProperty("fields_types_jar")));
SIMPLE_JAR = getRunfile(runfiles, "simplejar");
MULTIDEX_JAR = getRunfile(runfiles, "multidexjar");
JSIMPLE_JAR = getRunfile(runfiles, "jsimplejar");
FIELDS_TYPES_JAR = getRunfile(runfiles, "fields_types_jar");
} catch (Exception e) {
throw new ExceptionInInitializerError(e);
}
}

private static Path getRunfile(Runfiles runfiles, String property) {
String path = System.getProperty(property);
// This code lives simultaneously in a repo called google3 as well as the current repo
// rules_android. We check both prefixes to ensure the runfiles can be found in both
// environments.
String google3Path = runfiles.rlocation("google3/" + path);
if (google3Path != null && Files.exists(Paths.get(google3Path))) {
return Paths.get(google3Path);
}
String rulesAndroidPath = runfiles.rlocation("rules_android/" + path);
if (rulesAndroidPath != null && Files.exists(Paths.get(rulesAndroidPath))) {
return Paths.get(rulesAndroidPath);
}

// Fallback for cases where neither prefix works (e.g. absolute paths or other prefixes)
String rlocation = runfiles.rlocation(path);
if (rlocation != null) {
return Paths.get(rlocation);
}

throw new RuntimeException(
"Could not find runfile for property " + property + ": " + path);
}

private Path simpleDexArchive;
private Path multidexArchive;
private Path jsimpleDexArchive;
Expand Down