Skip to content

Commit 2cd03fa

Browse files
ted-xiecopybara-github
authored andcommitted
Add DesugarDexShardingActionTest to OSS
This was accidentally omitted during the DesugarDexSharding refactor. PiperOrigin-RevId: 936718923 Change-Id: Ie7243480a4d4b49ac8d9bce2d791394b65c38243
1 parent 0b10fbb commit 2cd03fa

3 files changed

Lines changed: 29 additions & 3 deletions

File tree

src/tools/javatests/com/google/devtools/build/android/BUILD

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,23 @@ java_test(
257257
],
258258
)
259259

260+
java_test(
261+
name = "DesugarDexShardingActionTest",
262+
size = "small",
263+
srcs = ["DesugarDexShardingActionTest.java"],
264+
data = [
265+
"//src/tools/java/com/google/devtools/build/android:DesugarDexShardingAction",
266+
"//tools/android:android_jar_for_test",
267+
],
268+
deps = [
269+
":guava",
270+
"//src/tools/java/com/google/devtools/build/android:desugar_dex_sharding_lib",
271+
"@rules_android_maven//:com_google_jimfs_jimfs",
272+
"@rules_android_maven//:com_google_truth_truth",
273+
"@rules_android_maven//:junit_junit",
274+
],
275+
)
276+
260277
java_test(
261278
name = "ManifestMergerActionTest",
262279
size = "small",

src/tools/javatests/com/google/devtools/build/android/DesugarDexShardingActionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ public void setup() {
4040
androidJar =
4141
Path.of(
4242
runfilesBase.toString(),
43-
"third_party/java/android/android_sdk_linux/platforms/stable/android.jar");
43+
"tools/android/android_jar_for_test.jar");
4444
classpath =
4545
Path.of(
4646
runfilesBase.toString(),
47-
"third_party/bazel_rules/rules_android/src/tools/java/com/google/devtools/build/android/libandroid_builder_lib.jar");
47+
"src/tools/java/com/google/devtools/build/android/libandroid_builder_lib.jar");
4848
in =
4949
Path.of(
5050
runfilesBase.toString(),
51-
"third_party/bazel_rules/rules_android/src/tools/java/com/google/devtools/build/android/DesugarDexShardingAction.jar");
51+
"src/tools/java/com/google/devtools/build/android/DesugarDexShardingAction.jar");
5252
}
5353

5454
private List<Path> createOutputFiles(int shardCount) throws IOException {

tools/android/BUILD

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@ android_jar(
2828
visibility = ["//visibility:public"],
2929
)
3030

31+
genrule(
32+
name = "android_jar_for_test",
33+
testonly = 1,
34+
srcs = [":android_jar"],
35+
outs = ["android_jar_for_test.jar"],
36+
cmd = "cp $(SRCS) $@",
37+
visibility = ["//src/tools/javatests:__subpackages__"],
38+
)
39+
3140
# TODO(b/175833857): This is a stub, should remove.
3241
alias(
3342
name = "merge_manifests",

0 commit comments

Comments
 (0)