Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea9bf2a5 authored by Jerome Gaillard's avatar Jerome Gaillard
Browse files

Use HWUIProperties.sysprop in host builds 

It uses android-base properties now, so is compatible with host.

Bug: 322360037
Test: build libhwui on host
Change-Id: I6502fe3001aac3d95ea2cd2c8327b8fe7baae55a
parent fc0e80a2

libs/hwui/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -563,6 +563,7 @@ cc_defaults { 
        "FrameInfoVisualizer.cpp",

        "FrameInfoVisualizer.cpp",

        "FrameMetricsReporter.cpp",

        "FrameMetricsReporter.cpp",

        "Gainmap.cpp",

        "Gainmap.cpp",

        "HWUIProperties.sysprop",

        "Interpolator.cpp",

        "Interpolator.cpp",

        "JankTracker.cpp",

        "JankTracker.cpp",

        "LightingInfo.cpp",

        "LightingInfo.cpp",
@@ -628,7 +629,6 @@ cc_defaults { 
                "AutoBackendTextureRelease.cpp",

                "AutoBackendTextureRelease.cpp",

                "DeferredLayerUpdater.cpp",

                "DeferredLayerUpdater.cpp",

                "HardwareBitmapUploader.cpp",

                "HardwareBitmapUploader.cpp",

                "HWUIProperties.sysprop",

                "Layer.cpp",

                "Layer.cpp",

                "LayerUpdateQueue.cpp",

                "LayerUpdateQueue.cpp",

                "ProfileDataContainer.cpp",

                "ProfileDataContainer.cpp",

libs/hwui/Properties.cpp

+2 −14
Original line number Original line Diff line number Diff line
@@ -16,10 +16,6 @@ 




#include "Properties.h"

#include "Properties.h"





#include "Debug.h"

#ifdef __ANDROID__

#include "HWUIProperties.sysprop.h"

#endif

#include <android-base/properties.h>

#include <android-base/properties.h>

#include <cutils/compiler.h>

#include <cutils/compiler.h>

#include <log/log.h>

#include <log/log.h>
@@ -28,6 +24,8 @@ 
#include <cstdlib>

#include <cstdlib>

#include <optional>

#include <optional>





#include "Debug.h"

#include "HWUIProperties.sysprop.h"

#include "src/core/SkTraceEventCommon.h"

#include "src/core/SkTraceEventCommon.h"





#ifdef __ANDROID__

#ifdef __ANDROID__
@@ -47,16 +45,6 @@ constexpr bool hdr_10bit_plus() { 
namespace android {

namespace android {

namespace uirenderer {

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::debugLayersUpdates = false;

bool Properties::debugOverdraw = false;

bool Properties::debugOverdraw = false;

bool Properties::debugTraceGpuResourceCategories = false;

bool Properties::debugTraceGpuResourceCategories = false;