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

Commit cc63340c authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Clean up ANGLE on system build configuration. 

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
parent 71287f5e

target/product/angle_default.mk

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,5 @@ 
# 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_supported.mk)



PRODUCT_SYSTEM_PROPERTIES += \

    persist.graphics.egl=angle

target/product/angle_supported.mk

deleted100644 → 0
+0 −29
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 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

target/product/base_system.mk

+0 −4
Original line number Diff line number Diff line
@@ -374,14 +374,10 @@ ifeq (,$(DISABLE_WALLPAPER_BACKUP)) 
    WallpaperBackup

endif



# Moving angle from vendor to system

ifeq ($(RELEASE_ANGLE_ON_SYSTEM),true)

PRODUCT_PACKAGES += \

    libEGL_angle \

    libGLESv1_CM_angle \

    libGLESv2_angle

$(call soong_config_set,angle,angle_on_system,true)

endif



# For testing purposes

ifeq ($(FORCE_AUDIO_SILENT), true)