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.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"],
}
diff --git a/graphics/composer/2.2/utils/vts/VtsHalGraphicsComposerTestUtils.cpp b/graphics/composer/2.2/utils/vts/ComposerVts.cpp
similarity index 96%
rename from graphics/composer/2.2/utils/vts/VtsHalGraphicsComposerTestUtils.cpp
rename to graphics/composer/2.2/utils/vts/ComposerVts.cpp
index 96413c2..b536f67 100644
--- a/graphics/composer/2.2/utils/vts/VtsHalGraphicsComposerTestUtils.cpp
+++ b/graphics/composer/2.2/utils/vts/ComposerVts.cpp
@@ -14,18 +14,18 @@
* limitations under the License.
*/
-#include <VtsHalHidlTargetTestBase.h>
-#include <hidl/HidlTransportUtils.h>
+#include <composer-vts/2.2/ComposerVts.h>
+#include <VtsHalHidlTargetTestBase.h>
#include <composer-command-buffer/2.2/ComposerCommandBuffer.h>
-#include "2.2/VtsHalGraphicsComposerTestUtils.h"
+#include <hidl/HidlTransportUtils.h>
namespace android {
namespace hardware {
namespace graphics {
namespace composer {
namespace V2_2 {
-namespace tests {
+namespace vts {
using android::hardware::details::canCastInterface;
using android::hardware::details::getDescriptor;
@@ -56,7 +56,7 @@
return keys;
}
-void ComposerClient_v2_2::execute_v2_2(V2_1::tests::TestCommandReader* reader,
+void ComposerClient_v2_2::execute_v2_2(V2_1::vts::TestCommandReader* reader,
V2_2::CommandWriterBase* writer) {
bool queueChanged = false;
uint32_t commandLength = 0;
@@ -119,7 +119,7 @@
*outFence = 0;
}
-} // namespace tests
+} // namespace vts
} // namespace V2_2
} // namespace composer
} // namespace graphics
diff --git a/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/VtsHalGraphicsComposerTestUtils.h b/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h
similarity index 82%
rename from graphics/composer/2.2/utils/vts/include/composer-vts/2.2/VtsHalGraphicsComposerTestUtils.h
rename to graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h
index c5756ed..eced69f 100644
--- a/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/VtsHalGraphicsComposerTestUtils.h
+++ b/graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h
@@ -22,11 +22,11 @@
#include <unordered_set>
#include <vector>
-#include <VtsHalGraphicsComposerTestUtils.h>
#include <VtsHalHidlTargetTestBase.h>
#include <android/hardware/graphics/composer/2.2/IComposer.h>
#include <android/hardware/graphics/composer/2.2/IComposerClient.h>
#include <composer-command-buffer/2.2/ComposerCommandBuffer.h>
+#include <composer-vts/2.1/ComposerVts.h>
#include <utils/StrongPointer.h>
namespace android {
@@ -34,7 +34,7 @@
namespace graphics {
namespace composer {
namespace V2_2 {
-namespace tests {
+namespace vts {
using android::hardware::graphics::common::V1_0::ColorMode;
using android::hardware::graphics::common::V1_0::Dataspace;
@@ -47,22 +47,22 @@
// Only thing I need for Composer_v2_2 is to create a v2_2 ComposerClient
// Everything else is the same
-class Composer_v2_2 : public V2_1::tests::Composer {
+class Composer_v2_2 : public V2_1::vts::Composer {
public:
- Composer_v2_2() : V2_1::tests::Composer(){};
- explicit Composer_v2_2(const std::string& name) : V2_1::tests::Composer(name){};
+ Composer_v2_2() : V2_1::vts::Composer(){};
+ explicit Composer_v2_2(const std::string& name) : V2_1::vts::Composer(name){};
std::unique_ptr<ComposerClient_v2_2> createClient_v2_2();
};
// A wrapper to IComposerClient.
class ComposerClient_v2_2
- : public android::hardware::graphics::composer::V2_1::tests::ComposerClient {
+ : public android::hardware::graphics::composer::V2_1::vts::ComposerClient {
public:
ComposerClient_v2_2(const sp<IComposerClient>& client)
- : V2_1::tests::ComposerClient(client), mClient_v2_2(client){};
+ : V2_1::vts::ComposerClient(client), mClient_v2_2(client){};
- void execute_v2_2(V2_1::tests::TestCommandReader* reader, V2_2::CommandWriterBase* writer);
+ void execute_v2_2(V2_1::vts::TestCommandReader* reader, V2_2::CommandWriterBase* writer);
std::vector<IComposerClient::PerFrameMetadataKey> getPerFrameMetadataKeys(Display display);
@@ -76,7 +76,7 @@
sp<V2_2::IComposerClient> mClient_v2_2;
};
-} // namespace tests
+} // namespace vts
} // namespace V2_2
} // namespace composer
} // namespace graphics