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

Commit 11edb41b authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic3217d68f7aa51ff40895a2fccaeb3625390c45e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04d56713 492220c6

target/product/angle_default.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -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

target/product/angle_supported.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -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

target/product/base_system.mk

+9 −0
Original line number Original line Diff line number Diff line
@@ -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