diff options
author | Krzysztof KosiĆski <krzysio@google.com> | 2022-11-22 18:16:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-22 18:16:24 +0000 |
commit | dde555974136bf0ed28d24e577bb0cf850faa600 (patch) | |
tree | c5640e30b582e7b4417a3f3b0be4e2c021e7de0e | |
parent | 27ee51d20cab2b25c4fa65ca9208eca862dfe6d3 (diff) | |
parent | 14df851054f76ee2cceda006c74958d2f7d7c686 (diff) | |
download | truth-dde555974136bf0ed28d24e577bb0cf850faa600.tar.gz |
Use asm built from source. am: 14df851054platform-tools-34.0.0platform-tools-33.0.4main-16k-with-phones
Original change: https://android-review.googlesource.com/c/platform/external/truth/+/2305453
Change-Id: I9652f8feabfd7b17d8298100514b1d6cad248454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -39,10 +39,19 @@ java_library { ], static_libs: [ "guava", - "asm-9.2", ], plugins: ["auto_value_plugin"], sdk_version: "current", + // Exclude the functionality that requires bytecode analysis on the device. + // Android does not use standard Java .class files. + target: { + android: { + exclude_srcs: ["core/src/main/java/com/google/common/truth/ActualValueInference.java"], + }, + host: { + static_libs: ["ow2-asm"], + }, + }, errorprone: { javacflags: [ "-Xep:NoCanIgnoreReturnValueOnClasses:WARN", |