commit d47f4a9d650ba807a9654d661374cd849f6bd251
author Daniel Nicoara <dnicoara@google.com> Tue May 30 15:38:30 2017 -0400
committer Daniel Nicoara <dnicoara@google.com> Tue May 30 15:53:19 2017 -0400
tree 4c42e85dbb27e8bcdedbf42c34cb4941b9a9c814
parent 3b073bcbc2ec4549c0757b8f65928614c769d4bb

Move utility classes in a separate static target

Split up utility classes that can be re-used in other IComposer related
tests (such as the IVrComposerClient tests).

Changes:
 * Move GraphicsComposerCallback into separate module
 * Extract TestCommandReader in separate module
 * Extract Composer::execute() from test class

Bug: 38203529
Test: Compiled
Change-Id: I0d1193469e9dd94c477a63058f98111c162dfa99

graphics/composer/2.1/vts/functional/Android.bp

diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp
index 66323d4..2e87144 100644
--- a/graphics/composer/2.1/vts/functional/Android.bp
+++ b/graphics/composer/2.1/vts/functional/Android.bp
@@ -17,9 +17,18 @@
 cc_library_static {
     name: "libVtsHalGraphicsComposerTestUtils",
     defaults: ["hidl_defaults"],
-    srcs: ["VtsHalGraphicsComposerTestUtils.cpp"],
-    shared_libs: ["android.hardware.graphics.composer@2.1"],
+    srcs: [
+        "GraphicsComposerCallback.cpp",
+        "TestCommandReader.cpp",
+        "VtsHalGraphicsComposerTestUtils.cpp",
+    ],
+    shared_libs: [
+        "android.hardware.graphics.composer@2.1",
+        "libfmq",
+        "libsync",
+    ],
     static_libs: [
+        "libhwcomposer-command-buffer",
         "VtsHalHidlTargetTestBase",
     ],
     cflags: [
@@ -28,6 +37,7 @@
         "-Werror",
         "-O0",
         "-g",
+        "-DLOG_TAG=\"GraphicsComposerTestUtils\"",
     ],
     export_include_dirs: ["."],
 }