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
diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp
index ac296af..8e346df 100644
--- a/graphics/composer/2.1/vts/functional/Android.bp
+++ b/graphics/composer/2.1/vts/functional/Android.bp
@@ -27,10 +27,9 @@
static_libs: [
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.composer@2.1",
+ "android.hardware.graphics.composer@2.1-vts",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.0-vts",
- "libVtsHalGraphicsComposerTestUtils",
- "libnativehelper",
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
diff --git a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
index fd8a316..8b8b530 100644
--- a/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
+++ b/graphics/composer/2.1/vts/functional/VtsHalGraphicsComposerV2_1TargetTest.cpp
@@ -17,10 +17,10 @@
#define LOG_TAG "graphics_composer_hidl_hal_test"
#include <android-base/logging.h>
+#include <composer-vts/2.1/ComposerVts.h>
+#include <composer-vts/2.1/GraphicsComposerCallback.h>
+#include <composer-vts/2.1/TestCommandReader.h>
#include <mapper-vts/2.0/MapperVts.h>
-#include "GraphicsComposerCallback.h"
-#include "TestCommandReader.h"
-#include "VtsHalGraphicsComposerTestUtils.h"
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
@@ -38,7 +38,7 @@
namespace graphics {
namespace composer {
namespace V2_1 {
-namespace tests {
+namespace vts {
namespace {
using android::hardware::graphics::common::V1_0::BufferUsage;
@@ -685,7 +685,7 @@
}
} // namespace
-} // namespace tests
+} // namespace vts
} // namespace V2_1
} // namespace composer
} // namespace graphics
@@ -693,7 +693,7 @@
} // namespace android
int main(int argc, char** argv) {
- using android::hardware::graphics::composer::V2_1::tests::GraphicsComposerHidlEnvironment;
+ using android::hardware::graphics::composer::V2_1::vts::GraphicsComposerHidlEnvironment;
::testing::AddGlobalTestEnvironment(GraphicsComposerHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv);
GraphicsComposerHidlEnvironment::Instance()->init(&argc, argv);
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
diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp
index c090a23..7747900 100644
--- a/graphics/composer/2.2/vts/functional/Android.bp
+++ b/graphics/composer/2.2/vts/functional/Android.bp
@@ -27,14 +27,13 @@
],
static_libs: [
"android.hardware.graphics.allocator@2.0",
- "android.hardware.graphics.composer@2.2",
"android.hardware.graphics.composer@2.1",
+ "android.hardware.graphics.composer@2.1-vts",
+ "android.hardware.graphics.composer@2.2",
+ "android.hardware.graphics.composer@2.2-vts",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.mapper@2.0-vts",
"android.hardware.graphics.mapper@2.1",
- "libVtsHalGraphicsComposerTestUtils",
- "libVtsHalGraphicsComposerTestUtils@2.2",
- "libnativehelper",
],
header_libs: [
"android.hardware.graphics.composer@2.1-command-buffer",
diff --git a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
index 6fbdd3c..c494329 100644
--- a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
+++ b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
@@ -16,23 +16,20 @@
#define LOG_TAG "graphics_composer_hidl_hal_test@2.2"
+#include <VtsHalHidlTargetTestBase.h>
#include <android-base/logging.h>
#include <android/hardware/graphics/mapper/2.1/IMapper.h>
+#include <composer-vts/2.1/GraphicsComposerCallback.h>
+#include <composer-vts/2.1/TestCommandReader.h>
+#include <composer-vts/2.2/ComposerVts.h>
#include <mapper-vts/2.0/MapperVts.h>
-#include <sync/sync.h>
-#include "2.2/VtsHalGraphicsComposerTestUtils.h"
-#include "GraphicsComposerCallback.h"
-#include "TestCommandReader.h"
-#include "VtsHalGraphicsComposerTestUtils.h"
-
-#include <VtsHalHidlTargetTestBase.h>
namespace android {
namespace hardware {
namespace graphics {
namespace composer {
namespace V2_2 {
-namespace tests {
+namespace vts {
namespace {
using android::hardware::graphics::common::V1_0::BufferUsage;
@@ -71,7 +68,7 @@
GraphicsComposerHidlEnvironment::Instance()->getServiceName<IComposer>()));
ASSERT_NO_FATAL_FAILURE(mComposerClient = mComposer->createClient_v2_2());
- mComposerCallback = new V2_1::tests::GraphicsComposerCallback;
+ mComposerCallback = new V2_1::vts::GraphicsComposerCallback;
mComposerClient->registerCallback(mComposerCallback);
// assume the first display is primary and is never removed
@@ -95,7 +92,7 @@
std::unique_ptr<Composer_v2_2> mComposer;
std::unique_ptr<ComposerClient_v2_2> mComposerClient;
- sp<V2_1::tests::GraphicsComposerCallback> mComposerCallback;
+ sp<V2_1::vts::GraphicsComposerCallback> mComposerCallback;
// the first display and is assumed never to be removed
Display mPrimaryDisplay;
@@ -122,7 +119,7 @@
ASSERT_NO_FATAL_FAILURE(mGralloc = std::make_unique<Gralloc>());
mWriter = std::make_unique<V2_2::CommandWriterBase>(1024);
- mReader = std::make_unique<V2_1::tests::TestCommandReader>();
+ mReader = std::make_unique<V2_1::vts::TestCommandReader>();
}
void TearDown() override { ASSERT_NO_FATAL_FAILURE(GraphicsComposerHidlTest::TearDown()); }
@@ -142,7 +139,7 @@
void execute() { mComposerClient->execute_v2_2(mReader.get(), mWriter.get()); }
std::unique_ptr<V2_2::CommandWriterBase> mWriter;
- std::unique_ptr<V2_1::tests::TestCommandReader> mReader;
+ std::unique_ptr<V2_1::vts::TestCommandReader> mReader;
private:
std::unique_ptr<Gralloc> mGralloc;
@@ -239,7 +236,7 @@
}
} // namespace
-} // namespace tests
+} // namespace vts
} // namespace V2_2
} // namespace composer
} // namespace graphics
@@ -247,7 +244,7 @@
} // namespace android
int main(int argc, char** argv) {
- using android::hardware::graphics::composer::V2_2::tests::GraphicsComposerHidlEnvironment;
+ using android::hardware::graphics::composer::V2_2::vts::GraphicsComposerHidlEnvironment;
::testing::AddGlobalTestEnvironment(GraphicsComposerHidlEnvironment::Instance());
::testing::InitGoogleTest(&argc, argv);
GraphicsComposerHidlEnvironment::Instance()->init(&argc, argv);