Add a public API for conflict resolution when merging DEX (for bazel to allow duplicate classes) [241063980]

Fixed

Feature Request

adexe s nau

Status Update

No update yet.

Description

sg...@google.com

created issue #1

Aug 2, 2022 09:06AM

This is derived from b/240438146.

Right now bazel use DexFileMergerHelper from D8/R8 for merging, if the class can be found. If it is not found the standard D8 merging is used.

The DexFileMergerHelper implements support for multiple definitions when merging DEX using an internal conflict resolution API. So without extending the D8 API this cannot be moved to bazel code.

The problem for bazel is that the r8lib.jar that is released on Maven does not have the class DexFileMergerHelper (no keep rule in the build for it), so with the new bazel support for pulling D8/R8 from Maven the default D8 merging is used failing when there are duplicate classes (which is what was reported in b/240438146).

With the API landed the code can be moved to bazel.

Comments

ap...@google.com <ap...@google.com> #2Aug 3, 2022 09:17AM

Fixed in r1313.

ap...@google.com <ap...@google.com> #3Aug 3, 2022 09:17AM

[Empty comment from Monorail migration]

ap...@google.com <ap...@google.com> #4Aug 3, 2022 12:13PM

[Empty comment from Monorail migration]

ap...@google.com <ap...@google.com> #5Aug 26, 2022 11:50AM

This issue was migrated from

crbug.com/nativeclient/245?no_tracker_redirect=1

[Monorail components: TrustedRT]

ap...@google.com <ap...@google.com> #6Sep 7, 2022 09:03AM

Project: r8
Branch: 4.0

commit 31f7563dd59c9e655223172aa397136f008feca2
Author: Ian Zerny <zerny@google.com>
Date: Wed Sep 07 10:42:20 2022

Version 4.0.26

Bug:

b/241063980

Change-Id: I79569f1c437e2f7f23c24662c8a1b9315f47079f

M src/main/java/com/android/tools/r8/Version.java

https://r8-review.googlesource.com/71285

ap...@google.com <ap...@google.com> #7Sep 7, 2022 09:03AM

Project: r8
Branch: 4.0

commit be20fc5267d42dbe7055d57ce1c63c5beac54466
Author: Ian Zerny <zerny@google.com>
Date: Wed Sep 07 10:41:26 2022

Add API for resolving duplicate definition conflicts.

Bug:

b/241063980

Change-Id: I40294a8be3a8af70fa902d599c68a3df49004a29

M src/test/java/com/android/tools/r8/invalid/DuplicateDefinitionsTest.java
M src/main/java/com/android/tools/r8/R8Command.java
M src/main/java/com/android/tools/r8/D8Command.java
M src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
A src/test/java/com/android/tools/r8/compilerapi/classconflictresolver/ClassConflictResolverTest.java
M src/main/java/com/android/tools/r8/L8Command.java
M src/test/java/com/android/tools/r8/invalid/DuplicateProgramTypesTest.java
M src/test/java/com/android/tools/r8/compilerapi/CompilerApiTestCollection.java
A src/main/java/com/android/tools/r8/ClassConflictResolver.java
M src/main/java/com/android/tools/r8/BaseCompilerCommand.java

https://r8-review.googlesource.com/71284

ap...@google.com <ap...@google.com> #8Sep 7, 2022 12:10PM

Project: r8
Branch: 3.2

commit ba87afbfbf5f480ff9f5ce3590a379e1de43eca0
Author: Ian Zerny <zerny@google.com>
Date: Wed Sep 07 11:29:14 2022

Version 3.2.79

Bug:

b/241063980

Change-Id: I7c6505daa2b9856d910ba86bfa5165ce4e640a32

M src/main/java/com/android/tools/r8/Version.java

https://r8-review.googlesource.com/71288

ap...@google.com <ap...@google.com> #9Sep 7, 2022 12:10PM

Project: r8
Branch: 3.2

commit d56e386538b672b69b73025db1d78aee857b2c23
Author: Ian Zerny <zerny@google.com>
Date: Wed Sep 07 11:29:00 2022

Add API for resolving duplicate definition conflicts.

Bug:

b/241063980

Change-Id: I40294a8be3a8af70fa902d599c68a3df49004a29

M src/main/java/com/android/tools/r8/R8Command.java
M src/test/java/com/android/tools/r8/invalid/DuplicateDefinitionsTest.java
M src/main/java/com/android/tools/r8/D8Command.java
M src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
A src/test/java/com/android/tools/r8/compilerapi/classconflictresolver/ClassConflictResolverTest.java
M src/main/java/com/android/tools/r8/L8Command.java
M src/test/java/com/android/tools/r8/invalid/DuplicateProgramTypesTest.java
M src/test/java/com/android/tools/r8/compilerapi/CompilerApiTestCollection.java
M src/main/java/com/android/tools/r8/BaseCompilerCommand.java
A src/main/java/com/android/tools/r8/ClassConflictResolver.java

https://r8-review.googlesource.com/71287

ap...@google.com <ap...@google.com> #10Sep 7, 2022 12:10PM

Project: r8
Branch: 3.2

commit 29b97fd567eab7a3a91b371703046bad385b47a8
Author: Ian Zerny <zerny@google.com>
Date: Wed Sep 07 11:13:11 2022

Move class conflict resolver into internal options.

Bug:

b/241063980

Change-Id: Ie3ff481895b8b09336f37defbc4782deb509c27f

M src/main/java/com/android/tools/r8/graph/LazyLoadedDexApplication.java
M src/main/java/com/android/tools/r8/DexFileMergerHelper.java
M src/main/java/com/android/tools/r8/graph/DexApplication.java
M src/main/java/com/android/tools/r8/utils/InternalOptions.java
M src/main/java/com/android/tools/r8/dex/ApplicationReader.java

https://r8-review.googlesource.com/71286

ze...@google.com <ze...@google.com> #11Sep 7, 2022 12:13PM

This API is now on 3.2 and 4.0 so tools can use it if the change to DexFileMerger flows to a path with and older D8.

See cl/472695637

ap...@google.com <ap...@google.com> #12Sep 9, 2022 08:59AM

Project: r8
Branch: 3.2

commit ea532dbb7d1dd4d27e08613e8a55de97ae65138f
Author: Søren Gjesse <sgjesse@google.com>
Date: Thu Sep 08 15:58:52 2022

Version 3.2.80

Resolve merge issues in 3.2.79.

Bug:

b/241063980

Change-Id: I4e230bc56a85852719c2c6ad8e1865565f519c8c

M src/main/java/com/android/tools/r8/utils/ProgramClassCollection.java
M src/main/java/com/android/tools/r8/Version.java
M src/main/java/com/android/tools/r8/dex/ApplicationReader.java

https://r8-review.googlesource.com/71305

ap...@google.com <ap...@google.com> #13Sep 9, 2022 10:44AM

Project: r8
Branch: 3.3

commit 8217864d4a75503a69911143c52bf76d10cf16ce
Author: Ian Zerny <zerny@google.com>
Date: Fri Sep 09 11:42:52 2022

Version 3.3.78

Bug:

b/241063980

Change-Id: I0c260d0a0f76cbd23f67d75d5367ed2e849f2290

M src/main/java/com/android/tools/r8/Version.java

https://r8-review.googlesource.com/71326

ap...@google.com <ap...@google.com> #14Sep 9, 2022 10:44AM

Project: r8
Branch: 3.3

commit b1d28df67039cc8bb7d5adf3cbbc47fd54e58bba
Author: Ian Zerny <zerny@google.com>
Date: Fri Sep 09 11:42:35 2022

Add API for resolving duplicate definition conflicts.

Bug:

b/241063980

https://r8-review.googlesource.com/71325

ap...@google.com <ap...@google.com> #15Sep 9, 2022 10:44AM

Project: r8
Branch: 3.3

commit 89b3113da07834ac285de196fd069c3f75b14ea6
Author: Ian Zerny <zerny@google.com>
Date: Fri Sep 09 11:27:20 2022

Move class conflict resolver into internal options.

Bug:

b/241063980

https://r8-review.googlesource.com/71324

ze...@google.com <ze...@google.com> Oct 11, 2022 07:00AM

Marked as fixed.

go...@gmail.com <go...@gmail.com> #16Dec 18, 2022 12:30PM

Travis acct zdvm saccharine

ap...@google.com <ap...@google.com> #17Aug 8, 2023 03:23PM

Project: r8
Branch: main

commit 636dd075e983ee6a2a63c7ca3ecabaf65219dfb2
Author: Ian Zerny <zerny@google.com>
Date: Tue Aug 08 13:56:50 2023

Remove DexFileMergerHelper

Bug:

b/241063980

Change-Id: I4f9d0c78deda94dca39c7bf89eda1de1820a3e2a

D src/main/java/com/android/tools/r8/DexFileMergerHelper.java
M src/test/java/com/android/tools/r8/desugar/desugaredlibrary/MergingJ$Test.java

https://r8-review.googlesource.com/82102

Issue 241063980

Description

Issue summary

Comments

ap...@google.com <ap...@google.com> #2Aug 3, 2022 09:17AM

ap...@google.com <ap...@google.com> #3Aug 3, 2022 09:17AM

ap...@google.com <ap...@google.com> #4Aug 3, 2022 12:13PM

ap...@google.com <ap...@google.com> #5Aug 26, 2022 11:50AM

ap...@google.com <ap...@google.com> #6Sep 7, 2022 09:03AM

ap...@google.com <ap...@google.com> #7Sep 7, 2022 09:03AM

ap...@google.com <ap...@google.com> #8Sep 7, 2022 12:10PM

ap...@google.com <ap...@google.com> #9Sep 7, 2022 12:10PM

ap...@google.com <ap...@google.com> #10Sep 7, 2022 12:10PM

ze...@google.com <ze...@google.com> #11Sep 7, 2022 12:13PM

ap...@google.com <ap...@google.com> #12Sep 9, 2022 08:59AM

ap...@google.com <ap...@google.com> #13Sep 9, 2022 10:44AM

ap...@google.com <ap...@google.com> #14Sep 9, 2022 10:44AM

ap...@google.com <ap...@google.com> #15Sep 9, 2022 10:44AM

ze...@google.com <ze...@google.com> Oct 11, 2022 07:00AM

go...@gmail.com <go...@gmail.com> #16Dec 18, 2022 12:30PM

ap...@google.com <ap...@google.com> #17Aug 8, 2023 03:23PM

Add comment

Issue metadata