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

Commit bd5bad91 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Remove USE_HWC2 plumbing and settings"

parents 4681fc38 b91e0c5a

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ $(call add_json_list, CoverageExcludePaths, $(COVERAGE_EXCLUDE_PATH 
$(call add_json_bool, ArtUseReadBarrier,                 $(call invert_bool,$(filter false,$(PRODUCT_ART_USE_READ_BARRIER))))

$(call add_json_bool, Binder32bit,                       $(BINDER32BIT))

$(call add_json_str,  BtConfigIncludeDir,                $(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR))

$(call add_json_bool, Device_uses_hwc2,                  $(filter true,$(TARGET_USES_HWC2)))

$(call add_json_list, DeviceKernelHeaders,               $(TARGET_PROJECT_SYSTEM_INCLUDES))

$(call add_json_bool, DevicePrefer32BitApps,             $(filter true,$(TARGET_PREFER_32_BIT_APPS)))

$(call add_json_bool, DevicePrefer32BitExecutables,      $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)))

target/board/BoardConfigEmuCommon.mk

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH) 
# no hardware camera

USE_CAMERA_STUB := true



TARGET_USES_HWC2 := true

NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3



# Build OpenGLES emulation guest and host libraries

target/board/treble_common.mk

+0 −2
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ TARGET_COPY_OUT_VENDOR := vendor 
# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true



# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true

# Set emulator framebuffer display device buffer count to 3

NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3