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

graphics/composer/aidl/vts/Android.bp

@@ -34,10 +34,10 @@ cc_test {
     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: [

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>
 

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"
 

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 {

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>

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 {

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"