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

Commit b4ce5172 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Ravenwood] Stop flag hardcoding on native side" into main

parents 25a2c6dc 8d01b954

libs/hwui/Properties.cpp

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include "HWUIProperties.sysprop.h"

#include "src/core/SkTraceEventCommon.h"



#ifdef __ANDROID__

#ifdef __linux__

#include <com_android_graphics_hwui_flags.h>

namespace hwui_flags = com::android::graphics::hwui::flags;

#else

#else // __linux__

namespace hwui_flags {

constexpr bool clip_surfaceviews() {

    return false;
@@ -61,7 +61,7 @@ constexpr bool calc_workload_orig_deadline() { 
    return false;

}

}  // namespace hwui_flags

#endif

#endif // __linux__



namespace android {

namespace uirenderer {

libs/hwui/hwui/Bitmap.cpp

+8 −4
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
#include "FeatureFlags.h"

#include "HardwareBitmapUploader.h"

#include "Properties.h"

#include "utils/Color.h"

#include <utils/Trace.h>



#ifdef __ANDROID__  // Layoutlib does not support render thread

#include <com_android_graphics_surfaceflinger_flags.h>

#include <private/android/AHardwareBufferHelpers.h>
@@ -28,8 +31,10 @@ 


#include "renderthread/RenderProxy.h"

#endif

#include "utils/Color.h"

#include <utils/Trace.h>



#ifdef __linux__

#include <com_android_graphics_hwui_flags.h>

#endif // __linux__



#ifndef _WIN32

#include <sys/mman.h>
@@ -62,8 +67,7 @@ 
#include <format>

#include <limits>



#ifdef __ANDROID__

#include <com_android_graphics_hwui_flags.h>

#ifdef __linux__

namespace hwui_flags = com::android::graphics::hwui::flags;

#else

namespace hwui_flags {

libs/hwui/hwui/DrawTextFunctor.h

+3 −3
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
#include "hwui/PaintFilter.h"

#include "pipeline/skia/SkiaRecordingCanvas.h"



#ifdef __ANDROID__

#ifdef __linux__

#include <com_android_graphics_hwui_flags.h>

namespace flags = com::android::graphics::hwui::flags;

#else

#else // __linux__

namespace flags {

constexpr bool high_contrast_text_small_text_rect() {

    return false;
@@ -41,7 +41,7 @@ constexpr bool high_contrast_text_inner_text_color() { 
    return false;

}

}  // namespace flags

#endif

#endif // __linux__



namespace android {