commit 853dc283c0853a8d59ce4022602f87a4e787d9f1
author Steven Moreland <smoreland@google.com> Tue Apr 06 18:17:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 06 18:17:47 2021 +0000
tree 0b72b622b4d351799932441578c05495031b3baa
parent 8f3d2fa64dfc3f0514a1ae5b4db9cfd5deeb58a1
parent d778b905f1ba9e1cd692c782e18d854888440007

Merge "libbinder: add libactivitymanager_aidl" am: 5e7768d724 am: d778b905f1

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1664326

Change-Id: I7a3fab68d51f1d6151ab29da166099502be5752e

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 2715d6a..05c32b3 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -296,3 +296,14 @@
         "liblog",
     ],
 }
+
+// TODO(b/183654927): initially empty lib to work around some merge conflicts
+cc_library {
+    name: "libactivitymanager_aidl",
+    srcs: [],
+    shared_libs: [
+        "libbinder",
+        "libutils",
+        "liblog",
+    ],
+}