From 2910d3d860044ef5fb0989306bafebc1c5545e42 Mon Sep 17 00:00:00 2001 From: Googler Date: Tue, 9 Feb 2021 16:57:25 -0800 Subject: [PATCH] Whitelist `android/device/collectors/*` from Android Platform Types - ` android/device/collectors/*` are from a user library instead pre-installed SDK, and therefore should be subject to normal desugar process instead core library desugaring process. PiperOrigin-RevId: 356624952 --- .../devtools/build/android/desugar/CorePackageRenamer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java index d2ea022f591f51..93ab650b329bfa 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/CorePackageRenamer.java @@ -69,6 +69,7 @@ public void visitMethodInsn( !remapper.didSomething || !owner.startsWith("android/") || owner.startsWith("android/arch/") + || owner.startsWith("android/device/collectors/") // b/179812549 || owner.startsWith("android/support/"), "%s calls %s.%s%s which is not supported with core library desugaring. Please file " + "a feature request to support this method", @@ -89,6 +90,7 @@ public void visitFieldInsn(int opcode, String owner, String name, String descrip || !owner.startsWith("android/") || owner.startsWith("android/arch/") || owner.startsWith("android/car/") + || owner.startsWith("android/device/collectors/") // b/179812549 || owner.startsWith("android/support/"), "%s accesses %s.%s: %s which is not supported with core library desugaring. Please file " + "a feature request to support this field",