Remove the never-used libgui reference in EVS app.
Test: build and run on Hawk
Change-Id: If114e3e90d40c41851d2e4f4c9dec39d1beffe98
diff --git a/evs/app/Android.mk b/evs/app/Android.mk
index cecbba5..0ee1e05 100644
--- a/evs/app/Android.mk
+++ b/evs/app/Android.mk
@@ -15,7 +15,6 @@
TexWrapper.cpp \
VideoTex.cpp \
StreamHandler.cpp \
- WindowSurface.cpp \
FormatConvert.cpp \
RenderPixelCopy.cpp
@@ -25,7 +24,6 @@
liblog \
libutils \
libui \
- libgui \
libhidlbase \
libhidltransport \
libEGL \
diff --git a/evs/app/WindowSurface.cpp b/evs/app/WindowSurface.cpp
deleted file mode 100644
index dbd245b..0000000
--- a/evs/app/WindowSurface.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2014 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 "WindowSurface.h"
-
-#include <gui/SurfaceComposerClient.h>
-#include <gui/ISurfaceComposer.h>
-#include <gui/Surface.h>
-#include <ui/DisplayInfo.h>
-
-using namespace android;
-
-WindowSurface::WindowSurface() {
- status_t err;
-
- sp<SurfaceComposerClient> surfaceComposerClient = new SurfaceComposerClient;
- err = surfaceComposerClient->initCheck();
- if (err != NO_ERROR) {
- fprintf(stderr, "SurfaceComposerClient::initCheck error: %#x\n", err);
- return;
- }
-
- // Get main display parameters.
- sp<IBinder> mainDpy = SurfaceComposerClient::getInternalDisplayToken();
- if (mainDpy == nullptr) {
- fprintf(stderr, "ERROR: no internal display\n");
- return;
- }
-
- DisplayInfo mainDpyInfo;
- err = SurfaceComposerClient::getDisplayInfo(mainDpy, &mainDpyInfo);
- if (err != NO_ERROR) {
- fprintf(stderr, "ERROR: unable to get display characteristics\n");
- return;
- }
-
- uint32_t width, height;
- if (mainDpyInfo.orientation != DISPLAY_ORIENTATION_0 &&
- mainDpyInfo.orientation != DISPLAY_ORIENTATION_180) {
- // rotated
- width = mainDpyInfo.h;
- height = mainDpyInfo.w;
- } else {
- width = mainDpyInfo.w;
- height = mainDpyInfo.h;
- }
-
- sp<SurfaceControl> sc = surfaceComposerClient->createSurface(
- String8("Benchmark"), width, height,
- PIXEL_FORMAT_RGBX_8888, ISurfaceComposerClient::eOpaque);
- if (sc == NULL || !sc->isValid()) {
- fprintf(stderr, "Failed to create SurfaceControl\n");
- return;
- }
-
- SurfaceComposerClient::Transaction{}
- .setLayer(sc, 0x7FFFFFFF) // always on top
- .show(sc)
- .apply();
-
- mSurfaceControl = sc;
-}
-
-EGLNativeWindowType WindowSurface::getSurface() const {
- sp<ANativeWindow> anw = mSurfaceControl->getSurface();
- return (EGLNativeWindowType) anw.get();
-}
-
diff --git a/evs/app/WindowSurface.h b/evs/app/WindowSurface.h
deleted file mode 100644
index 966ea11..0000000
--- a/evs/app/WindowSurface.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 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.
- */
-
-#ifndef OPENGL_TESTS_WINDOWSURFACE_H
-#define OPENGL_TESTS_WINDOWSURFACE_H
-
-#include <gui/SurfaceControl.h>
-
-#include <EGL/egl.h>
-
-
-/*
- * A window that covers the entire display surface.
- *
- * The window is destroyed when this object is destroyed, so don't try
- * to use the surface after that point.
- */
-class WindowSurface {
-public:
- // Creates the window.
- WindowSurface();
-
- // Retrieves a handle to the window.
- EGLNativeWindowType getSurface() const;
-
-private:
- WindowSurface(const WindowSurface&) = delete;
- WindowSurface& operator=(const WindowSurface&) = delete;
-
- android::sp<android::SurfaceControl> mSurfaceControl;
-};
-
-#endif /* OPENGL_TESTS_WINDOWSURFACE_H */