drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename perfetto proto package imported in the framework

Browse Source 
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
This commit is contained in:
Pablo Gamito 2024-01-12 11:32:18 +00:00
parent 6ecbbc746c
commit 48b7475629
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/tests/coretests/src/android/tracing/perfetto/DataSourceTest.java
View File

@ -16,13 +16,14 @@
package android.tracing.perfetto; 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.io.File.createTempFile;
import static java.nio.file.Files.createTempDirectory; import static java.nio.file.Files.createTempDirectory;
import static perfetto.protos.PerfettoTrace.TestEvent.PAYLOAD; import android.internal.perfetto.protos.PerfettoTrace;
import static perfetto.protos.PerfettoTrace.TestEvent.TestPayload.SINGLE_INT;
import static perfetto.protos.PerfettoTrace.TracePacket.FOR_TESTING;
import android.tools.common.ScenarioBuilder; import android.tools.common.ScenarioBuilder;
import android.tools.common.Tag; import android.tools.common.Tag;
import android.tools.common.io.TraceType; import android.tools.common.io.TraceType;
@ -56,7 +57,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import perfetto.protos.PerfettoConfig; import perfetto.protos.PerfettoConfig;
import perfetto.protos.PerfettoTrace;
import perfetto.protos.TracePacketOuterClass; import perfetto.protos.TracePacketOuterClass;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)

3
framework-jarjar-rules.txt
View File

@ -8,3 +8,6 @@ rule com.android.server.vcn.util.** com.android.server.vcn.repackaged.util.@1
# for modules-utils-build dependency # for modules-utils-build dependency
rule com.android.modules.utils.build.** android.internal.modules.utils.build.@1 rule com.android.modules.utils.build.** android.internal.modules.utils.build.@1
# For Perfetto proto dependencies
rule perfetto.protos.** android.internal.perfetto.protos.@1