StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up ANGLE on system build configuration.

Browse Source 
Now that ANGLE on system is in fully released, clean up the build file
configuration and remove the flags.

Bug: b/293503000
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: Ie8294b6494e2fad44ff102ecf0018916d61b082a
Merged-In: Ie8294b6494e2fad44ff102ecf0018916d61b082a
This commit is contained in:
Peiyong Lin
2024-02-29 01:34:09 +00:00
parent 71287f5e6b
commit cc63340cd1
3 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/angle_default.mk
View File

@@ -17,7 +17,5 @@
# To enable ANGLE as the default system GLES drivers, add # To enable ANGLE as the default system GLES drivers, add
# $(call inherit-product, $(SRC_TARGET_DIR)/product/angle_default.mk) to the Makefile. # $(call inherit-product, $(SRC_TARGET_DIR)/product/angle_default.mk) to the Makefile.
$(call inherit-product, $(SRC_TARGET_DIR)/product/angle_supported.mk)
PRODUCT_SYSTEM_PROPERTIES += \ PRODUCT_SYSTEM_PROPERTIES += \
persist.graphics.egl=angle persist.graphics.egl=angle

29
target/product/angle_supported.mk
View File

@@ -1,29 +0,0 @@
#
# 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 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.
ifneq ($(RELEASE_ANGLE_ON_SYSTEM),true)
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
endif

4
target/product/base_system.mk
View File

@@ -374,14 +374,10 @@ ifeq (,$(DISABLE_WALLPAPER_BACKUP))
WallpaperBackup WallpaperBackup
endif endif
# Moving angle from vendor to system
ifeq ($(RELEASE_ANGLE_ON_SYSTEM),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libEGL_angle \ libEGL_angle \
libGLESv1_CM_angle \ libGLESv1_CM_angle \
libGLESv2_angle libGLESv2_angle
$(call soong_config_set,angle,angle_on_system,true)
endif
# For testing purposes # For testing purposes
ifeq ($(FORCE_AUDIO_SILENT), true) ifeq ($(FORCE_AUDIO_SILENT), true)