commit 33fa2361aff264e2eb11678235431e6cf4b18461
author Jiwen 'Steve' Cai <jwcai@google.com> Thu Dec 13 13:52:45 2018 -0800
committer Jiwen Cai <jwcai@google.com> Fri Dec 14 00:17:04 2018 +0000
tree c043da0f0011639f45a01fb575fca21ef7872038
parent 047b87b0ee45b8b1be4f438b21bae0ef6b45530a

Combine tests into BufferHub_test

Bug: 112940221
Bug: 117177773
Test: BufferHub_test
Change-Id: I06c127e44ab7c58fe5db4143f1659aa4be4eeba0

libs/ui/tests/Android.bp

diff --git a/libs/ui/tests/Android.bp b/libs/ui/tests/Android.bp
index c0f4c89..a670b3c 100644
--- a/libs/ui/tests/Android.bp
+++ b/libs/ui/tests/Android.bp
@@ -45,7 +45,7 @@
 }
 
 cc_test {
-    name: "BufferHubBuffer_test",
+    name: "BufferHub_test",
     header_libs: [
         "libbufferhub_headers",
         "libdvr_headers",
@@ -67,18 +67,7 @@
     srcs: [
         "BufferHubBuffer_test.cpp",
         "BufferHubEventFd_test.cpp",
+        "BufferHubMetadata_test.cpp",
     ],
     cflags: ["-Wall", "-Werror"],
 }
-
-cc_test {
-    name: "BufferHubMetadata_test",
-    header_libs: ["libdvr_headers"],
-    shared_libs: [
-        "libbase",
-        "libui",
-        "libutils",
-    ],
-    srcs: ["BufferHubMetadata_test.cpp"],
-    cflags: ["-Wall", "-Werror"],
-}