From f3c79b73414f9c45662ed67c1333945c50eb799b Mon Sep 17 00:00:00 2001
From: Samiul Islam <samiul@google.com>
Date: Thu, 26 Aug 2021 11:41:57 +0100
Subject: libbinder: split out PackageManagerNative aidl

Very few clients of libbinder use PackageManagerNative service, as such
it's a waste to couple them together. Now, user of PackageManagerNative
service need to add the corresponding aidl files as shared library.

Bug: 183654927
Test: builds + presubmit

Change-Id: I691fefed4ee0a3d7e16acba5c052ca3747a411f3
Merged-In: I691fefed4ee0a3d7e16acba5c052ca3747a411f3
(cherry picked from commit 165de728cd7c974df3000f8d5df857532952d8eb)
---
 Android.bp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Android.bp b/Android.bp
index 736bc40..b665a12 100644
--- a/Android.bp
+++ b/Android.bp
@@ -99,6 +99,8 @@ cc_defaults {
         // errors if we use lite
         "libprotobuf-cpp-full",
 
+        "packagemanager_aidl-cpp",
+
         // phenotype flags support
         "server_configurable_flags",
     ],
@@ -108,6 +110,10 @@ cc_defaults {
     // TODO: can we use the lite library somehow?
 
     header_libs: ["librxcpp"],
+
+    export_shared_lib_headers: [
+        "packagemanager_aidl-cpp",
+    ],
 }
 
 cc_library_static {
@@ -125,6 +131,7 @@ cc_library_static {
         "libbinder",
         "libutils",
         "libcutils", // tracing.
+        "packagemanager_aidl-cpp",
     ],
     aidl: {
         local_include_dirs: ["binder"],
@@ -135,6 +142,10 @@ cc_library_static {
     static_libs: [
        "libplatformprotos",  // android framework C++ protos.
     ],
+
+    export_shared_lib_headers: [
+        "packagemanager_aidl-cpp",
+    ],
 }
 
 cc_defaults {
-- 
cgit v1.2.3