Revert "Move proto definitions to external/perfetto"
This reverts commit bec51fdc3c8a42cbcb833d7d14800fbb0a14a7f3.
Reason for revert: 298512106
Change-Id: Icb9d6d5a23176a809c3b71bcaa3928b03dfb0622
diff --git a/services/surfaceflinger/layerproto/Android.bp b/services/surfaceflinger/layerproto/Android.bp
index a4dc8a0..7287dd0 100644
--- a/services/surfaceflinger/layerproto/Android.bp
+++ b/services/surfaceflinger/layerproto/Android.bp
@@ -13,20 +13,7 @@
srcs: [
"LayerProtoParser.cpp",
- ],
-
- static_libs: [
- "libperfetto_client_experimental",
- ],
-
- whole_static_libs: [
- // TODO(b/169779783): move into "static_libs" when the soong issue is fixed
- "perfetto_trace_protos",
- ],
-
- export_static_lib_headers: [
- "libperfetto_client_experimental",
- "perfetto_trace_protos",
+ "*.proto",
],
shared_libs: [
@@ -37,6 +24,10 @@
"libbase",
],
+ proto: {
+ export_proto_headers: true,
+ },
+
cppflags: [
"-Werror",
"-Wno-unused-parameter",
@@ -51,3 +42,22 @@
"-Wno-undef",
],
}
+
+java_library_static {
+ name: "layersprotoslite",
+ host_supported: true,
+ proto: {
+ type: "lite",
+ include_dirs: ["external/protobuf/src"],
+ },
+ srcs: ["*.proto"],
+ sdk_version: "core_platform",
+ target: {
+ android: {
+ jarjar_rules: "jarjar-rules.txt",
+ },
+ host: {
+ static_libs: ["libprotobuf-java-lite"],
+ },
+ },
+}