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

Commit 20d1b668 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Split ANGLE supported and enabled into different Makefiles. 

ANGLE binaries should be added to the PRODUCT_PACKAGES instead. This
patch also splits the angle.mk to angle_supported.mk and
angle_default.mk so that when a device just wants to ship ANGLE binaries
to coexist with native GLES drivers, it only needs to inherit the
angle_supported.mk and when a device wants to ship ANGLE as the default
system GLES drivers, it only needs to inherit the angle_default.mk. When
ANGLE is the default system GLES driver, make sure persist.graphics.egl
is defined so that ANGLE is loaded properly.

Bug: 270994705
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I3de4a40b62b39c91c8f6df56d68755830b303f10
parent cf972638

target/product/angle_default.mk

0 → 100644
+23 −0
Original line number Diff line number Diff line 
#

# Copyright 2023 The Android Open-Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



# To enable ANGLE as the default system GLES drivers, add

# $(call inherit-product, $(SRC_TARGET_DIR)/product/angle_enabled.mk) to the Makefile.



$(call inherit-product, $(SRC_TARGET_DIR)/product/angle_supported.mk)



PRODUCT_VENDOR_PROPERTIES += \

    persist.graphics.egl=angle

target/product/angle.mk→target/product/angle_supported.mk

+5 −4
Original line number Diff line number Diff line
@@ -14,13 +14,14 @@ 
# limitations under the License.

#



# To include ANGLE drivers into the build, add

# $(call inherit-product, $(SRC_TARGET_DIR)/product/angle.mk) to the Makefile.

# To include ANGLE into the image build, add

# $(call inherit-product, $(SRC_TARGET_DIR)/product/angle_supported.mk) to the Makefile.

# By default, this will allow ANGLE binaries to coexist with native GLES drivers.



PRODUCT_PACKAGES := \

PRODUCT_PACKAGES += \

    libEGL_angle \

    libGLESv1_CM_angle \

    libGLESv2_angle



# Set ro.gfx.angle.supported based on if ANGLE is installed in vendor partition

PRODUCT_VENDOR_PROPERTIES := ro.gfx.angle.supported=true
 
PRODUCT_VENDOR_PROPERTIES += ro.gfx.angle.supported=true