Remove the hwc_test.vsoc binary
That binary was intended to test edge compositions in a fast manner,
but it has become outdated and conflicts with the current state of the
hwcomposer.
Test: none
Change-Id: I63305aa31183dc4e3b93dc73a98526639c01f528
diff --git a/guest/hals/hwcomposer/legacy/Android.mk b/guest/hals/hwcomposer/legacy/Android.mk
index 23faeee..f2fe5c3 100644
--- a/guest/hals/hwcomposer/legacy/Android.mk
+++ b/guest/hals/hwcomposer/legacy/Android.mk
@@ -42,46 +42,3 @@
endif
include $(BUILD_SHARED_LIBRARY)
-
-# An executable to run some tests
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := hwc_tests.vsoc
-LOCAL_MODULE_TAGS := optional
-LOCAL_VENDOR_MODULE := true
-
-LOCAL_SHARED_LIBRARIES := \
- liblog \
- libbase \
- libcutils \
- libutils \
- libsync \
- libhardware \
- libjpeg \
- vsoc_lib \
- $(VSOC_STLPORT_LIBS)
-
-LOCAL_STATIC_LIBRARIES := \
- libyuv_static
-
-LOCAL_SRC_FILES := \
- hwc_tests.cpp \
- vsoc_composer.cpp \
- base_composer.cpp \
- geometry_utils.cpp
-
-
-LOCAL_CFLAGS += \
- $(VSOC_VERSION_CFLAGS) \
- -Wall -Werror
-
-LOCAL_C_INCLUDES := \
- device/google/cuttlefish_common \
- device/google/cuttlefish_kernel \
- bionic \
- $(VSOC_STLPORT_INCLUDES)
-
-LOCAL_HEADER_LIBRARIES := \
- libhardware_headers
-
-include $(BUILD_EXECUTABLE)
diff --git a/guest/hals/hwcomposer/legacy/hwc_tests.cpp b/guest/hals/hwcomposer/legacy/hwc_tests.cpp
deleted file mode 100644
index 46362c2..0000000
--- a/guest/hals/hwcomposer/legacy/hwc_tests.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#include <stdio.h>
-#include "vsoc_composer.h"
-
-// This executable is only intended to perform simple tests on the hwcomposer
-// functionality. It should not be part of the images, but rather be included
-// (via scp) when needed to test specific scenarios that are hard to reproduce
-// in the normal operation of the device.
-
-class HWC_Tester : public cvd::VSoCComposer {
- public:
- HWC_Tester() : cvd::VSoCComposer(int64_t(0), int32_t(16000000)) {}
- int RunTest() {
- // Allocate two buffers (1x1 and 800x1280)
- buffer_handle_t src_handle;
- int src_stride;
- int res = gralloc_dev_->device.alloc(
- &gralloc_dev_->device, 1, 1, HAL_PIXEL_FORMAT_RGBA_8888,
- GRALLOC_USAGE_SW_READ_OFTEN, &src_handle, &src_stride);
- if (res) {
- fprintf(stderr, "Error allocating source buffer, see logs for details\n");
- return -1;
- }
- buffer_handle_t dst_handle;
- int dst_stride;
- res = gralloc_dev_->device.alloc(
- &gralloc_dev_->device, 800, 1280, HAL_PIXEL_FORMAT_RGBA_8888,
- GRALLOC_USAGE_SW_WRITE_OFTEN, &dst_handle, &dst_stride);
- if (res) {
- fprintf(stderr,
- "Error allocating destination buffer, see logs for details\n");
- return -1;
- }
- // Create a mock layer requesting a sinple copy of the pixels so that DoCopy
- // gets called
- vsoc_hwc_layer src_layer;
- src_layer.compositionType = HWC_OVERLAY;
- src_layer.hints = 0;
- src_layer.flags = 0;
- src_layer.handle = src_handle;
-
- // No transformation, just a copy
- src_layer.transform = 0;
- src_layer.blending = HWC_BLENDING_NONE;
-
- src_layer.sourceCrop.top = 0;
- src_layer.sourceCrop.left = 0;
- src_layer.sourceCrop.bottom = 1;
- src_layer.sourceCrop.right = 1;
-
- src_layer.displayFrame.top = 0;
- src_layer.displayFrame.left = 0;
- src_layer.displayFrame.bottom = 1;
- src_layer.displayFrame.right = 1;
-
- src_layer.visibleRegionScreen.numRects = 0;
- src_layer.visibleRegionScreen.rects = NULL;
-
- src_layer.acquireFenceFd = -1;
- src_layer.releaseFenceFd = -1;
- // Call CompositeLayer
- CompositeLayer(&src_layer, dst_handle);
- // If we got this far without a SEGFAULT we call it success
- printf("OK\n");
- gralloc_dev_->device.free(&gralloc_dev_->device, src_handle);
- gralloc_dev_->device.free(&gralloc_dev_->device, dst_handle);
- return 0;
- }
-};
-
-int main() {
- HWC_Tester t;
- return t.RunTest();
-}
