diff options
| -rw-r--r-- | libs/gui/tests/Android.bp | 3 | ||||
| -rw-r--r-- | libs/gui/tests/Surface_test.cpp | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libs/gui/tests/Android.bp b/libs/gui/tests/Android.bp index 7f960abb35..a6bcd107af 100644 --- a/libs/gui/tests/Android.bp +++ b/libs/gui/tests/Android.bp @@ -39,6 +39,7 @@ cc_test { shared_libs: [ "android.hardware.configstore@1.0", "android.hardware.configstore-utils", + "libSurfaceFlingerProp", "libbase", "liblog", "libEGL", @@ -53,6 +54,8 @@ cc_test { "libutils", "libnativewindow" ], + + header_libs: ["libsurfaceflinger_headers"], } // Build a separate binary to $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp index 2de6b69659..d1d770e542 100644 --- a/libs/gui/tests/Surface_test.cpp +++ b/libs/gui/tests/Surface_test.cpp @@ -18,17 +18,18 @@ #include <gtest/gtest.h> +#include <SurfaceFlingerProperties.h> #include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h> #include <binder/ProcessState.h> #include <configstore/Utils.h> #include <cutils/properties.h> -#include <inttypes.h> #include <gui/BufferItemConsumer.h> #include <gui/IDisplayEventConnection.h> #include <gui/IProducerListener.h> #include <gui/ISurfaceComposer.h> #include <gui/Surface.h> #include <gui/SurfaceComposerClient.h> +#include <inttypes.h> #include <private/gui/ComposerService.h> #include <ui/Rect.h> #include <utils/String8.h> @@ -46,11 +47,9 @@ using ui::ColorMode; using Transaction = SurfaceComposerClient::Transaction; -static bool hasWideColorDisplay = - getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasWideColorDisplay>(false); +static bool hasWideColorDisplay = android::sysprop::has_wide_color_display(false); -static bool hasHdrDisplay = - getBool<ISurfaceFlingerConfigs, &ISurfaceFlingerConfigs::hasHDRDisplay>(false); +static bool hasHdrDisplay = android::sysprop::has_HDR_display(false); class FakeSurfaceComposer; class FakeProducerFrameEventHistory; |