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/command-buffer/Android.bp b/graphics/composer/2.1/utils/command-buffer/Android.bp
index e8d41c2..140d9bb 100644
--- a/graphics/composer/2.1/utils/command-buffer/Android.bp
+++ b/graphics/composer/2.1/utils/command-buffer/Android.bp
@@ -2,6 +2,15 @@
name: "android.hardware.graphics.composer@2.1-command-buffer",
defaults: ["hidl_defaults"],
vendor_available: true,
- shared_libs: ["android.hardware.graphics.composer@2.1"],
+ shared_libs: [
+ "android.hardware.graphics.composer@2.1",
+ "libfmq",
+ "libsync",
+ ],
+ export_shared_lib_headers: [
+ "android.hardware.graphics.composer@2.1",
+ "libfmq",
+ "libsync",
+ ],
export_include_dirs: ["include"],
}
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"],
}
diff --git a/graphics/composer/2.1/utils/vts/VtsHalGraphicsComposerTestUtils.cpp b/graphics/composer/2.1/utils/vts/ComposerVts.cpp
similarity index 98%
rename from graphics/composer/2.1/utils/vts/VtsHalGraphicsComposerTestUtils.cpp
rename to graphics/composer/2.1/utils/vts/ComposerVts.cpp
index a7f3ecd..2f531b4 100644
--- a/graphics/composer/2.1/utils/vts/VtsHalGraphicsComposerTestUtils.cpp
+++ b/graphics/composer/2.1/utils/vts/ComposerVts.cpp
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-#include <VtsHalHidlTargetTestBase.h>
+#include <composer-vts/2.1/ComposerVts.h>
-#include "VtsHalGraphicsComposerTestUtils.h"
+#include <VtsHalHidlTargetTestBase.h>
namespace android {
namespace hardware {
namespace graphics {
namespace composer {
namespace V2_1 {
-namespace tests {
+namespace vts {
Composer::Composer() {
mComposer = ::testing::VtsHalHidlTargetTestBase::getService<IComposer>();
@@ -316,7 +316,7 @@
});
}
-} // namespace tests
+} // namespace vts
} // namespace V2_1
} // namespace composer
} // namespace graphics
diff --git a/graphics/composer/2.1/utils/vts/GraphicsComposerCallback.cpp b/graphics/composer/2.1/utils/vts/GraphicsComposerCallback.cpp
index f7ea306..1ead138 100644
--- a/graphics/composer/2.1/utils/vts/GraphicsComposerCallback.cpp
+++ b/graphics/composer/2.1/utils/vts/GraphicsComposerCallback.cpp
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-#include "GraphicsComposerCallback.h"
+#include <composer-vts/2.1/GraphicsComposerCallback.h>
namespace android {
namespace hardware {
namespace graphics {
namespace composer {
namespace V2_1 {
-namespace tests {
+namespace vts {
void GraphicsComposerCallback::setVsyncAllowed(bool allowed) {
std::lock_guard<std::mutex> lock(mMutex);
@@ -84,7 +84,7 @@
return Void();
}
-} // namespace tests
+} // namespace vts
} // namespace V2_1
} // namespace composer
} // namespace graphics
diff --git a/graphics/composer/2.1/utils/vts/TestCommandReader.cpp b/graphics/composer/2.1/utils/vts/TestCommandReader.cpp
index 671005d..6f8f1ad 100644
--- a/graphics/composer/2.1/utils/vts/TestCommandReader.cpp
+++ b/graphics/composer/2.1/utils/vts/TestCommandReader.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "TestCommandReader.h"
+#include <composer-vts/2.1/TestCommandReader.h>
#include <gtest/gtest.h>
@@ -23,7 +23,7 @@
namespace graphics {
namespace composer {
namespace V2_1 {
-namespace tests {
+namespace vts {
void TestCommandReader::parse() {
while (!isEmpty()) {
@@ -54,7 +54,7 @@
}
}
-} // namespace tests
+} // namespace vts
} // namespace V2_1
} // namespace composer
} // namespace graphics
diff --git a/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/VtsHalGraphicsComposerTestUtils.h b/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/ComposerVts.h
similarity index 95%
rename from graphics/composer/2.1/utils/vts/include/composer-vts/2.1/VtsHalGraphicsComposerTestUtils.h
rename to graphics/composer/2.1/utils/vts/include/composer-vts/2.1/ComposerVts.h
index 2a0b960..0d883e4 100644
--- a/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/VtsHalGraphicsComposerTestUtils.h
+++ b/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/ComposerVts.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef VTS_HAL_GRAPHICS_COMPOSER_UTILS
-#define VTS_HAL_GRAPHICS_COMPOSER_UTILS
+#pragma once
#include <memory>
#include <string>
@@ -25,16 +24,15 @@
#include <android/hardware/graphics/composer/2.1/IComposer.h>
#include <composer-command-buffer/2.1/ComposerCommandBuffer.h>
+#include <composer-vts/2.1/TestCommandReader.h>
#include <utils/StrongPointer.h>
-#include "TestCommandReader.h"
-
namespace android {
namespace hardware {
namespace graphics {
namespace composer {
namespace V2_1 {
-namespace tests {
+namespace vts {
using android::hardware::graphics::common::V1_0::ColorMode;
using android::hardware::graphics::common::V1_0::Dataspace;
@@ -120,11 +118,9 @@
std::unordered_map<Display, DisplayResource> mDisplayResources;
};
-} // namespace tests
+} // namespace vts
} // namespace V2_1
} // namespace composer
} // namespace graphics
} // namespace hardware
} // namespace android
-
-#endif // VTS_HAL_GRAPHICS_COMPOSER_UTILS
diff --git a/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/GraphicsComposerCallback.h b/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/GraphicsComposerCallback.h
index a42dac5..e3c348f 100644
--- a/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/GraphicsComposerCallback.h
+++ b/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/GraphicsComposerCallback.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef GRAPHICS_COMPOSER_CALLBACK_H
-#define GRAPHICS_COMPOSER_CALLBACK_H
+#pragma once
#include <android/hardware/graphics/composer/2.1/IComposerCallback.h>
@@ -27,7 +26,7 @@
namespace graphics {
namespace composer {
namespace V2_1 {
-namespace tests {
+namespace vts {
// IComposerCallback to be installed with IComposerClient::registerCallback.
class GraphicsComposerCallback : public IComposerCallback {
@@ -59,11 +58,9 @@
int mInvalidVsyncCount = 0;
};
-} // namespace tests
+} // namespace vts
} // namespace V2_1
} // namespace composer
} // namespace graphics
} // namespace hardware
} // namespace android
-
-#endif // GRAPHICS_COMPOSER_CALLBACK_H
diff --git a/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/TestCommandReader.h b/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/TestCommandReader.h
index fd7764f..3888eeb 100644
--- a/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/TestCommandReader.h
+++ b/graphics/composer/2.1/utils/vts/include/composer-vts/2.1/TestCommandReader.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef TEST_COMMAND_READER_H
-#define TEST_COMMAND_READER_H
+#pragma once
#include <composer-command-buffer/2.1/ComposerCommandBuffer.h>
@@ -24,7 +23,7 @@
namespace graphics {
namespace composer {
namespace V2_1 {
-namespace tests {
+namespace vts {
// A command parser that checks that no error nor unexpected commands are
// returned.
@@ -35,11 +34,9 @@
void parse();
};
-} // namespace tests
+} // namespace vts
} // namespace V2_1
} // namespace composer
} // namespace graphics
} // namespace hardware
} // namespace android
-
-#endif // TEST_COMMAND_READER_H