diff options
| -rw-r--r-- | libs/hwui/Android.bp | 2 | ||||
| -rw-r--r-- | libs/hwui/Properties.cpp | 16 |
2 files changed, 3 insertions, 15 deletions
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp index 4486f55aabf6..33830f154835 100644 --- a/libs/hwui/Android.bp +++ b/libs/hwui/Android.bp @@ -563,6 +563,7 @@ cc_defaults { "FrameInfoVisualizer.cpp", "FrameMetricsReporter.cpp", "Gainmap.cpp", + "HWUIProperties.sysprop", "Interpolator.cpp", "JankTracker.cpp", "LightingInfo.cpp", @@ -628,7 +629,6 @@ cc_defaults { "AutoBackendTextureRelease.cpp", "DeferredLayerUpdater.cpp", "HardwareBitmapUploader.cpp", - "HWUIProperties.sysprop", "Layer.cpp", "LayerUpdateQueue.cpp", "ProfileDataContainer.cpp", diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index 755332ff66fd..325bdd63ab22 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -16,10 +16,6 @@ #include "Properties.h" -#include "Debug.h" -#ifdef __ANDROID__ -#include "HWUIProperties.sysprop.h" -#endif #include <android-base/properties.h> #include <cutils/compiler.h> #include <log/log.h> @@ -28,6 +24,8 @@ #include <cstdlib> #include <optional> +#include "Debug.h" +#include "HWUIProperties.sysprop.h" #include "src/core/SkTraceEventCommon.h" #ifdef __ANDROID__ @@ -47,16 +45,6 @@ constexpr bool hdr_10bit_plus() { namespace android { namespace uirenderer { -#ifndef __ANDROID__ // Layoutlib does not compile HWUIProperties.sysprop as it depends on cutils properties -std::optional<bool> use_vulkan() { - return base::GetBoolProperty("ro.hwui.use_vulkan", true); -} - -std::optional<std::int32_t> render_ahead() { - return base::GetIntProperty("ro.hwui.render_ahead", 0); -} -#endif - bool Properties::debugLayersUpdates = false; bool Properties::debugOverdraw = false; bool Properties::debugTraceGpuResourceCategories = false; |