commit 96a098a80d9904f57d0ed65f9de8d210175a11c0
author Chia-I Wu <olv@google.com> Thu Jan 25 10:38:06 2018 -0800
committer Chia-I Wu <olv@google.com> Wed Feb 21 11:03:04 2018 -0800
tree f304ce63750d746d0ee0035156cba9604e164afb
parent 8b20c5c8817534def44224c9ab6dbe166e7383d6

graphics: more reusable libVtsHalGraphicsComposerTestUtils

Versioned library names, versioned include paths, and others.

Test: make VtsHalGraphicsComposerV2_1TargetTest
Change-Id: Ic266763c9ef25e09bc2c97026f2e1324609f48c6

graphics/composer/2.2/utils/vts/Android.bp

diff --git a/graphics/composer/2.2/utils/vts/Android.bp b/graphics/composer/2.2/utils/vts/Android.bp
index 6618b07..641fdcb 100644
--- a/graphics/composer/2.2/utils/vts/Android.bp
+++ b/graphics/composer/2.2/utils/vts/Android.bp
@@ -15,32 +15,25 @@
 //
 
 cc_library_static {
-    name: "libVtsHalGraphicsComposerTestUtils@2.2",
+    name: "android.hardware.graphics.composer@2.2-vts",
     defaults: ["hidl_defaults"],
     srcs: [
-        "VtsHalGraphicsComposerTestUtils.cpp",
-    ],
-    shared_libs: [
-        "android.hardware.graphics.composer@2.1",
-        "android.hardware.graphics.composer@2.2",
-        "libfmq",
-        "libsync",
+        "ComposerVts.cpp",
     ],
     static_libs: [
-        "libVtsHalGraphicsComposerTestUtils",
         "VtsHalHidlTargetTestBase",
+        "android.hardware.graphics.composer@2.1",
+        "android.hardware.graphics.composer@2.1-vts",
+        "android.hardware.graphics.composer@2.2",
     ],
     header_libs: [
         "android.hardware.graphics.composer@2.1-command-buffer",
         "android.hardware.graphics.composer@2.2-command-buffer",
     ],
     cflags: [
-        "-Wall",
-        "-Wextra",
-        "-Werror",
         "-O0",
         "-g",
-        "-DLOG_TAG=\"GraphicsComposerTestUtils@2.2\"",
+        "-DLOG_TAG=\"ComposerVts\"",
     ],
-    export_include_dirs: ["include/composer-vts"],
+    export_include_dirs: ["include"],
 }