graphics: more reusable libVtsHalGraphicsComposerTestUtils

Versioned library names, versioned include paths, and others.

Test: make VtsHalGraphicsComposerV2_1TargetTest
Change-Id: Ic266763c9ef25e09bc2c97026f2e1324609f48c6
diff --git a/graphics/composer/2.1/utils/vts/Android.bp b/graphics/composer/2.1/utils/vts/Android.bp
index 7f4a7c3..846cfdf 100644
--- a/graphics/composer/2.1/utils/vts/Android.bp
+++ b/graphics/composer/2.1/utils/vts/Android.bp
@@ -15,31 +15,24 @@
 //
 
 cc_library_static {
-    name: "libVtsHalGraphicsComposerTestUtils",
+    name: "android.hardware.graphics.composer@2.1-vts",
     defaults: ["hidl_defaults"],
     srcs: [
+        "ComposerVts.cpp",
         "GraphicsComposerCallback.cpp",
         "TestCommandReader.cpp",
-        "VtsHalGraphicsComposerTestUtils.cpp",
-    ],
-    shared_libs: [
-        "android.hardware.graphics.composer@2.1",
-        "libfmq",
-        "libsync",
     ],
     static_libs: [
         "VtsHalHidlTargetTestBase",
+        "android.hardware.graphics.composer@2.1",
     ],
     header_libs: [
         "android.hardware.graphics.composer@2.1-command-buffer",
     ],
     cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
         "-O0",
         "-g",
-        "-DLOG_TAG=\"GraphicsComposerTestUtils\"",
+        "-DLOG_TAG=\"ComposerVts\"",
     ],
-    export_include_dirs: ["include/composer-vts/2.1"],
+    export_include_dirs: ["include"],
 }