From 48b74756296d8cd921f5956965172c6a6e9d498a Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Fri, 12 Jan 2024 11:32:18 +0000 Subject: [PATCH] Rename perfetto proto package imported in the framework perfetto.protos is not an authorized package to be included in the bootclsspath. And because bootclasspath always takes precedence during class resolving, we don't want that when the perfetto library is imported somewhere else (e.g. in an app) that the class name be resolved to class in bootclasspath instead. Bug: 309630341 Test: presubmit checks Change-Id: I0c19bc503905cbb33e34240bd6ba970217ee3f29 --- .../src/android/tracing/perfetto/DataSourceTest.java | 10 +++++----- framework-jarjar-rules.txt | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java b/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java index b278dbafd5e1..bd2f36fb5198 100644 --- a/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java +++ b/core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java @@ -16,13 +16,14 @@ package android.tracing.perfetto; +import static android.internal.perfetto.protos.PerfettoTrace.TestEvent.PAYLOAD; +import static android.internal.perfetto.protos.PerfettoTrace.TestEvent.TestPayload.SINGLE_INT; +import static android.internal.perfetto.protos.PerfettoTrace.TracePacket.FOR_TESTING; + import static java.io.File.createTempFile; import static java.nio.file.Files.createTempDirectory; -import static perfetto.protos.PerfettoTrace.TestEvent.PAYLOAD; -import static perfetto.protos.PerfettoTrace.TestEvent.TestPayload.SINGLE_INT; -import static perfetto.protos.PerfettoTrace.TracePacket.FOR_TESTING; - +import android.internal.perfetto.protos.PerfettoTrace; import android.tools.common.ScenarioBuilder; import android.tools.common.Tag; import android.tools.common.io.TraceType; @@ -56,7 +57,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import perfetto.protos.PerfettoConfig; -import perfetto.protos.PerfettoTrace; import perfetto.protos.TracePacketOuterClass; @RunWith(AndroidJUnit4.class) diff --git a/framework-jarjar-rules.txt b/framework-jarjar-rules.txt index 03b268d87d01..6339a8703f01 100644 --- a/framework-jarjar-rules.txt +++ b/framework-jarjar-rules.txt @@ -8,3 +8,6 @@ rule com.android.server.vcn.util.** com.android.server.vcn.repackaged.util.@1 # for modules-utils-build dependency rule com.android.modules.utils.build.** android.internal.modules.utils.build.@1 + +# For Perfetto proto dependencies +rule perfetto.protos.** android.internal.perfetto.protos.@1