commit 4ba343c8885c8956fba9c20003651f7a9c8d8256
author Kean Mariotti <keanmariotti@google.com> Wed Apr 19 13:31:02 2023 +0000
committer Kean Mariotti <keanmariotti@google.com> Fri Sep 01 10:40:09 2023 +0000
tree 5f6c39b5deccebf35adb5dcf6414ba48f7f5ba65
parent 6cd4e62e9658ef43f47a198c5d6d69470418d4f0

Revert^2 Move proto definitions to external/perfetto

This commit moves the layer and transaction .proto files
to external/perfetto/protos/perfetto/trace/android/.

Test: atest libsurfaceflinger_unittest && atest transactiontrace_testsuite
Bug: b/284424784
Change-Id: Ia7e446c528d188c748a800fbf16ab3b8b9a7b9d1

services/surfaceflinger/tests/unittests/TransactionProtoParserTest.cpp

diff --git a/services/surfaceflinger/tests/unittests/TransactionProtoParserTest.cpp b/services/surfaceflinger/tests/unittests/TransactionProtoParserTest.cpp
index a95a645..cbb597a 100644
--- a/services/surfaceflinger/tests/unittests/TransactionProtoParserTest.cpp
+++ b/services/surfaceflinger/tests/unittests/TransactionProtoParserTest.cpp
@@ -85,7 +85,7 @@
 
     TransactionProtoParser parser(std::make_unique<TestMapper>(displayHandle));
 
-    proto::TransactionState proto = parser.toProto(t1);
+    perfetto::protos::TransactionState proto = parser.toProto(t1);
     TransactionState t2 = parser.fromProto(proto);
 
     ASSERT_EQ(t1.originPid, t2.originPid);
@@ -119,7 +119,7 @@
     d1.transformHint = ui::Transform::ROT_90;
 
     const uint32_t layerStack = 2;
-    google::protobuf::RepeatedPtrField<proto::DisplayInfo> displayProtos;
+    google::protobuf::RepeatedPtrField<perfetto::protos::DisplayInfo> displayProtos;
     auto displayInfoProto = displayProtos.Add();
     *displayInfoProto = TransactionProtoParser::toProto(d1, layerStack);
     frontend::DisplayInfos displayInfos;