commit d42b34cb65ea908b2a659e1b229bedfdded4481c
author Bill Yi <byi@google.com> Thu Feb 04 17:08:40 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 04 17:08:40 2021 +0000
tree e44c381c55283858492203d1092b521ae8514d90
parent 4b24f0912446dff4265e033da157ba8891a1b32e
parent 183b70fcba5d47d452fe29e9ce59d724143b726b

Merge "Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE"

debuggerd/proto/Android.bp

diff --git a/debuggerd/proto/Android.bp b/debuggerd/proto/Android.bp
index 5307d50..bb82f03 100644
--- a/debuggerd/proto/Android.bp
+++ b/debuggerd/proto/Android.bp
@@ -1,4 +1,9 @@
-cc_library {
+filegroup {
+    name: "libtombstone_proto-src",
+    srcs: ["tombstone.proto"],
+}
+
+cc_library_static {
     name: "libtombstone_proto",
     cflags: [
         "-Wall",
@@ -14,9 +19,11 @@
         type: "lite",
     },
 
-    srcs: [
-        "tombstone.proto",
-    ],
+    srcs: [":libtombstone_proto-src"],
+
+    // b/155341058: Soong doesn't automatically add libprotobuf if there aren't any explicitly
+    // listed protos in srcs.
+    static_libs: ["libprotobuf-cpp-lite"],
 
     stl: "libc++_static",
     apex_available: [

debuggerd/proto/tombstone.proto

diff --git a/debuggerd/proto/tombstone.proto b/debuggerd/proto/tombstone.proto
index aff50bd..38a06f4 100644
--- a/debuggerd/proto/tombstone.proto
+++ b/debuggerd/proto/tombstone.proto
@@ -1,5 +1,8 @@
 syntax = "proto3";
 
+option java_package = "com.android.server.os";
+option java_outer_classname = "TombstoneProtos";
+
 message Tombstone {
   Architecture arch = 1;
   string build_fingerprint = 2;