commit 2f0bf51fb362149cfd88d55b93a3a0bb89779e92
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 23 20:53:46 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 23 20:53:46 2020 +0000
tree 215fdbb0a58a12805aca2a844b763303bcf0599f
parent 93aa5d03955c0a132f847e46a6879268f629a28a
parent 0e679116fc77950ad659ff15470a20657b7e7e4e

Merge "Link resourceobserver_aidl statically in tests"

services/mediaresourcemanager/Android.bp

diff --git a/services/mediaresourcemanager/Android.bp b/services/mediaresourcemanager/Android.bp
index 96f2108..cdf5a4e 100644
--- a/services/mediaresourcemanager/Android.bp
+++ b/services/mediaresourcemanager/Android.bp
@@ -58,6 +58,9 @@
         "libbinder_ndk",
         "libutils",
         "liblog",
+    ],
+
+    static_libs: [
         "resourceobserver_aidl_interface-ndk_platform",
     ],
 

services/mediaresourcemanager/test/Android.bp

diff --git a/services/mediaresourcemanager/test/Android.bp b/services/mediaresourcemanager/test/Android.bp
index 7bdfc6f..308ee91 100644
--- a/services/mediaresourcemanager/test/Android.bp
+++ b/services/mediaresourcemanager/test/Android.bp
@@ -45,14 +45,16 @@
     name: "ResourceObserverService_test",
     srcs: ["ResourceObserverService_test.cpp"],
     test_suites: ["device-tests"],
-    static_libs: ["libresourcemanagerservice"],
+    static_libs: [
+        "libresourcemanagerservice",
+        "resourceobserver_aidl_interface-ndk_platform",
+    ],
     shared_libs: [
         "libbinder",
         "libbinder_ndk",
         "liblog",
         "libmedia",
         "libutils",
-        "resourceobserver_aidl_interface-ndk_platform",
     ],
     include_dirs: [
         "frameworks/av/include",