Skip to content

Commit

Permalink
Switch DexFileSplitter from depending on the Dex parsing library in d…
Browse files Browse the repository at this point in the history
…x to depending on the android_dex library from the remote Android tools.

Before this can be submitted, first unknown commit must be submitted and then the bazel remote Android tools must be updated to include unknown commit.

Fixes bazelbuild#15957.

RELNOTES: None
PiperOrigin-RevId: 468040969
Change-Id: Ia8ae2ef9c78ad6c88132a6de70666b15b2ecb1d8
  • Loading branch information
ahumesky authored and aiuto committed Oct 12, 2022
1 parent ac2e776 commit e71c779
Showing 1 changed file with 20 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@ package(default_visibility = ["//visibility:public"])

java_library(
name = "dexer",
srcs = glob(["*.java"]),
srcs = glob(
["*.java"],
exclude = [
# Separate DexFileSplitter's classes so they don't depend on dx.
"AsyncZipOut.java",
"DexFileSplitter.java",
"DexLimitTracker.java",
],
),
plugins = ["auto_value_plugin"],
deps = [
"//external:android/dx_jar_import",
Expand Down Expand Up @@ -32,7 +40,16 @@ java_binary(

java_binary(
name = "DexFileSplitter",
main_class = "com.google.devtools.build.android.dexer.DexFileSplitter",
srcs = [
"AsyncZipOut.java",
"DexFileSplitter.java",
"DexLimitTracker.java",
"ZipEntryComparator.java",
"ZipEntryPredicates.java",
],
plugins = ["auto_value_plugin"],
deps = [
"//src/tools/android/java/com/google/devtools/build/android:all_android_tools",
],
visibility = ["//tools/android:__subpackages__"],
runtime_deps = [":dexer"],
)

0 comments on commit e71c779

Please sign in to comment.