Update the test directory structure
vts is moved from aidl/android/ to aidl/vts
functional, include & composer-vts directory is removed as well.
BUG: 220171967
Test: atest VtsHalGraphicsComposer3_TargetTest
Change-Id: I6cafbbd99374308a1cc06e27cc590e70618f7075
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/Android.bp b/graphics/composer/aidl/vts/Android.bp
similarity index 93%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/Android.bp
rename to graphics/composer/aidl/vts/Android.bp
index 139b5e8..1e70a0e 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/Android.bp
+++ b/graphics/composer/aidl/vts/Android.bp
@@ -34,10 +34,10 @@
srcs: [
"VtsHalGraphicsComposer3_TargetTest.cpp",
"VtsHalGraphicsComposer3_ReadbackTest.cpp",
- "composer-vts/GraphicsComposerCallback.cpp",
- "composer-vts/ReadbackVts.cpp",
- "composer-vts/RenderEngineVts.cpp",
- "composer-vts/VtsComposerClient.cpp",
+ "GraphicsComposerCallback.cpp",
+ "ReadbackVts.cpp",
+ "RenderEngineVts.cpp",
+ "VtsComposerClient.cpp",
],
shared_libs: [
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/AndroidTest.xml b/graphics/composer/aidl/vts/AndroidTest.xml
similarity index 100%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/AndroidTest.xml
rename to graphics/composer/aidl/vts/AndroidTest.xml
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/GraphicsComposerCallback.cpp b/graphics/composer/aidl/vts/GraphicsComposerCallback.cpp
similarity index 98%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/GraphicsComposerCallback.cpp
rename to graphics/composer/aidl/vts/GraphicsComposerCallback.cpp
index 8f329b3..d534943 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/GraphicsComposerCallback.cpp
+++ b/graphics/composer/aidl/vts/GraphicsComposerCallback.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "include/GraphicsComposerCallback.h"
+#include "GraphicsComposerCallback.h"
#include <log/log_main.h>
#include <utils/Timers.h>
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/GraphicsComposerCallback.h b/graphics/composer/aidl/vts/GraphicsComposerCallback.h
similarity index 100%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/GraphicsComposerCallback.h
rename to graphics/composer/aidl/vts/GraphicsComposerCallback.h
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/OWNERS b/graphics/composer/aidl/vts/OWNERS
similarity index 100%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/OWNERS
rename to graphics/composer/aidl/vts/OWNERS
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/ReadbackVts.cpp b/graphics/composer/aidl/vts/ReadbackVts.cpp
similarity index 99%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/ReadbackVts.cpp
rename to graphics/composer/aidl/vts/ReadbackVts.cpp
index f8a0ec4..03b1b6c 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/ReadbackVts.cpp
+++ b/graphics/composer/aidl/vts/ReadbackVts.cpp
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "include/ReadbackVts.h"
+#include "ReadbackVts.h"
#include <aidl/android/hardware/graphics/common/BufferUsage.h>
-#include "include/RenderEngineVts.h"
+#include "RenderEngineVts.h"
#include "renderengine/ExternalTexture.h"
#include "renderengine/impl/ExternalTexture.h"
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/ReadbackVts.h b/graphics/composer/aidl/vts/ReadbackVts.h
similarity index 100%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/ReadbackVts.h
rename to graphics/composer/aidl/vts/ReadbackVts.h
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/RenderEngineVts.cpp b/graphics/composer/aidl/vts/RenderEngineVts.cpp
similarity index 98%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/RenderEngineVts.cpp
rename to graphics/composer/aidl/vts/RenderEngineVts.cpp
index 0a55484..71b011c 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/RenderEngineVts.cpp
+++ b/graphics/composer/aidl/vts/RenderEngineVts.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "include/RenderEngineVts.h"
+#include "RenderEngineVts.h"
#include "renderengine/impl/ExternalTexture.h"
namespace aidl::android::hardware::graphics::composer3::vts {
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/RenderEngineVts.h b/graphics/composer/aidl/vts/RenderEngineVts.h
similarity index 100%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/RenderEngineVts.h
rename to graphics/composer/aidl/vts/RenderEngineVts.h
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp b/graphics/composer/aidl/vts/VtsComposerClient.cpp
similarity index 99%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp
rename to graphics/composer/aidl/vts/VtsComposerClient.cpp
index 468a69d..2b60703 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/VtsComposerClient.cpp
+++ b/graphics/composer/aidl/vts/VtsComposerClient.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "include/VtsComposerClient.h"
+#include "VtsComposerClient.h"
#include <aidlcommonsupport/NativeHandle.h>
#include <android-base/logging.h>
#include <log/log_main.h>
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/VtsComposerClient.h b/graphics/composer/aidl/vts/VtsComposerClient.h
similarity index 100%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/composer-vts/include/VtsComposerClient.h
rename to graphics/composer/aidl/vts/VtsComposerClient.h
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
similarity index 99%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp
rename to graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
index 8f88bfc..f75af85 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
@@ -20,22 +20,22 @@
#include <aidl/Vintf.h>
#include <aidl/android/hardware/graphics/common/BufferUsage.h>
#include <aidl/android/hardware/graphics/composer3/IComposer.h>
-#include <composer-vts/include/ReadbackVts.h>
-#include <composer-vts/include/RenderEngineVts.h>
#include <gtest/gtest.h>
#include <ui/DisplayId.h>
#include <ui/DisplayIdentification.h>
#include <ui/GraphicBuffer.h>
#include <ui/PixelFormat.h>
#include <ui/Rect.h>
+#include "GraphicsComposerCallback.h"
+#include "ReadbackVts.h"
+#include "RenderEngineVts.h"
+#include "VtsComposerClient.h"
// tinyxml2 does implicit conversions >:(
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wconversion"
#include <tinyxml2.h>
#pragma clang diagnostic pop
-#include "composer-vts/include/GraphicsComposerCallback.h"
-#include "composer-vts/include/VtsComposerClient.h"
namespace aidl::android::hardware::graphics::composer3::vts {
namespace {
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
similarity index 99%
rename from graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp
rename to graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
index 35242c2..74a8a57 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_TargetTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -35,8 +35,8 @@
#include <numeric>
#include <string>
#include <thread>
-#include "composer-vts/include/GraphicsComposerCallback.h"
-#include "composer-vts/include/VtsComposerClient.h"
+#include "GraphicsComposerCallback.h"
+#include "VtsComposerClient.h"
#undef LOG_TAG
#define LOG_TAG "VtsHalGraphicsComposer3_TargetTest"