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

Commit 492220c6 authored Nov 02, 2023 by Peiyong Lin Committed by Gerrit Code Review Nov 02, 2023

Merge "Make ANGLE part of Android OS system image." into main

parents 821ab221 71af4496

target/product/angle_default.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,9 +15,9 @@
		#

		# 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_default.mk) to the Makefile.

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

		PRODUCT_VENDOR_PROPERTIES += \
		PRODUCT_SYSTEM_PROPERTIES += \
		persist.graphics.egl=angle

target/product/angle_supported.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		# $(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 \
		@@ -25,3 +26,4 @@ PRODUCT_PACKAGES += \

		# 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

+9 −0

Original line number	Diff line number	Diff line
		@@ -346,6 +346,15 @@ 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)
		PRODUCT_SYSTEM_PROPERTIES += ro.audio.silent=1