From d3df0ae39de6091c173111852b386fe216f15eaf Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Mon, 1 Feb 2021 14:35:30 -0800
Subject: [PATCH] Expose libtombstone_proto srcs.

Test: treehugger
Change-Id: I4f993e6bf025120bda82eb60f6c534f43030085c
---
 debuggerd/proto/Android.bp      | 15 +++++++++++----
 debuggerd/proto/tombstone.proto |  3 +++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debuggerd/proto/Android.bp b/debuggerd/proto/Android.bp
index 5307d50d0..bb82f032b 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 @@ cc_library {
         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: [
diff --git a/debuggerd/proto/tombstone.proto b/debuggerd/proto/tombstone.proto
index aff50bd54..38a06f4a4 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;