tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Merge "Split ANGLE supported and enabled into different Makefiles." am: d2704dc746" into stage-aosp-master am: 1001d9e2c9 am: b96628f013

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2571352

Change-Id: Iea9ff19384610cc3110707d3030988f4a48485c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker 2023-05-04 02:28:14 +00:00
commit 6480e51451
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
target/product/angle_default.mk Normal file
View file

@ -0,0 +1,23 @@
#
# 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

9
target/product/angle.mk → target/product/angle_supported.mk
View file

@ -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