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

Merge "Make ANGLE part of Android OS system image." into main am: 492220c695

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

Change-Id: Ife40b8f5563ebf220fd192ddcb26e5a1fefb1a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peiyong Lin
2023-11-02 16:47:08 +00:00
committed by Automerger Merge Worker
parent 65793a4a9a 492220c695
commit 0750e0bd17
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/angle_default.mk
View File

@@ -15,9 +15,9 @@
# #
# 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_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) $(call inherit-product, $(SRC_TARGET_DIR)/product/angle_supported.mk)
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_SYSTEM_PROPERTIES += \
persist.graphics.egl=angle persist.graphics.egl=angle

2
target/product/angle_supported.mk
View File

@@ -18,6 +18,7 @@
# $(call inherit-product, $(SRC_TARGET_DIR)/product/angle_supported.mk) to the Makefile. # $(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. # By default, this will allow ANGLE binaries to coexist with native GLES drivers.
ifneq ($(RELEASE_ANGLE_ON_SYSTEM),true)
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libEGL_angle \ libEGL_angle \
libGLESv1_CM_angle \ libGLESv1_CM_angle \
@@ -25,3 +26,4 @@ PRODUCT_PACKAGES += \
# Set ro.gfx.angle.supported based on if ANGLE is installed in vendor partition # 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
endif

9
target/product/base_system.mk
View File

@@ -346,6 +346,15 @@ ifeq (,$(DISABLE_WALLPAPER_BACKUP))
WallpaperBackup WallpaperBackup
endif 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 # For testing purposes
ifeq ($(FORCE_AUDIO_SILENT), true) ifeq ($(FORCE_AUDIO_SILENT), true)
PRODUCT_SYSTEM_PROPERTIES += ro.audio.silent=1 PRODUCT_SYSTEM_PROPERTIES += ro.audio.silent=1