commit ddd2282d46faccfea992f30e2c77d0f521666328
author Tianyu Jiang <tianyuj@google.com> Fri Dec 14 17:08:36 2018 -0800
committer Tianyu Jiang <tianyuj@google.com> Fri Dec 14 17:08:36 2018 -0800
tree 038d37f828a1bd6da3d543bbc80841d173e62332
parent 3150c3adca85e7d5659fab4f6d7cd8a27b7323c6

Combine server tests into one test target BufferHubServer_test

Bug: 112940221
Test: BufferHubServer_test
Change-Id: Ie775690c7e1b4be7d39282ef067adc21e52b1955

services/bufferhub/tests/Android.bp

diff --git a/services/bufferhub/tests/Android.bp b/services/bufferhub/tests/Android.bp
index bf65469..e565374 100644
--- a/services/bufferhub/tests/Android.bp
+++ b/services/bufferhub/tests/Android.bp
@@ -1,8 +1,11 @@
 cc_test {
-    name: "BufferNode_test",
-    srcs: ["BufferNode_test.cpp"],
+    name: "BufferHubServer_test",
+    srcs: [
+        "BufferNode_test.cpp",
+        "BufferHubIdGenerator_test.cpp",
+    ],
     cflags: [
-        "-DLOG_TAG=\"BufferNode_test\"",
+        "-DLOG_TAG=\"BufferHubServer_test\"",
         "-DTRACE=0",
         "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",
     ],
@@ -18,19 +21,3 @@
         "libgmock",
     ],
 }
-
-cc_test {
-    name: "BufferHubIdGenerator_test",
-    srcs: ["BufferHubIdGenerator_test.cpp"],
-    cflags: [
-        "-DLOG_TAG=\"BufferHubIdGenerator_test\"",
-        "-DTRACE=0",
-        "-DATRACE_TAG=ATRACE_TAG_GRAPHICS",
-    ],
-    shared_libs: [
-        "libbufferhubservice",
-    ],
-    static_libs: [
-        "libgmock",
-    ],
-}
\ No newline at end of file