Skip to content

Commit

Permalink
Rename perfetto proto package imported in the framework
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Pablo Gamito committed Jan 12, 2024
1 parent 6ecbbc7 commit 48b7475
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -56,7 +57,6 @@
import java.util.concurrent.atomic.AtomicReference;

import perfetto.protos.PerfettoConfig;
import perfetto.protos.PerfettoTrace;
import perfetto.protos.TracePacketOuterClass;

@RunWith(AndroidJUnit4.class)
Expand Down
3 changes: 3 additions & 0 deletions framework-jarjar-rules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 comments on commit 48b7475

Please sign in to comment.