Skip to content
Snippets Groups Projects
Commit 48b74756 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

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
parent 6ecbbc74
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment