Android/device_redroid-prebuilts
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build for Android 15 / 16

Browse Source
This commit is contained in:
Ziyang Zhou
2025-06-25 22:38:47 +08:00
parent c07aafa92b
commit 6248d6a71d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Android.mk
View File

@@ -76,7 +76,8 @@ $(foreach lib,$(libs),\
# DRI # DRI
dri_libs := libgallium_dri dri_libs := libgallium_dri
drv_libs := libgallium_drv_video drv_libs := libgallium_drv_video
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) ifneq (,$(filter $(TARGET_ARCH),x86 x86_64))
ifeq (,$(filter $(PLATFORM_VERSION), 15 16))
$(eval $(call define-redroid-prebuilt-lib,libigdgmm,,libigdgmm.so)) $(eval $(call define-redroid-prebuilt-lib,libigdgmm,,libigdgmm.so))
drv_libs_intel := i965_drv_video iHD_drv_video drv_libs_intel := i965_drv_video iHD_drv_video
$(foreach lib,$(drv_libs_intel),\ $(foreach lib,$(drv_libs_intel),\
@@ -84,6 +85,7 @@ $(foreach lib,$(drv_libs_intel),\
drv_libs += $(drv_libs_intel) drv_libs += $(drv_libs_intel)
endif endif
endif
dri_links := $(shell cd $(LOCAL_PATH)/prebuilts/$(TARGET_ARCH)/lib/dri && find * -name '*_dri.so' -type l) dri_links := $(shell cd $(LOCAL_PATH)/prebuilts/$(TARGET_ARCH)/lib/dri && find * -name '*_dri.so' -type l)
drv_links := $(shell cd $(LOCAL_PATH)/prebuilts/$(TARGET_ARCH)/lib/dri && find * -name '*_drv_video.so' -type l) drv_links := $(shell cd $(LOCAL_PATH)/prebuilts/$(TARGET_ARCH)/lib/dri && find * -name '*_drv_video.so' -type l)
$(eval $(call define-redroid-prebuilt-lib,libgallium_dri,,dri/libgallium_dri.so,dri,$(dri_links))) $(eval $(call define-redroid-prebuilt-lib,libgallium_dri,,dri/libgallium_dri.so,dri,$(dri_links)))
@@ -105,9 +107,11 @@ $(foreach lib,$(libs),\
## VA ## VA
ifeq (,$(filter $(PLATFORM_VERSION), 15 16))
va_libs := libva.so.2 libva-drm.so.2 va_libs := libva.so.2 libva-drm.so.2
$(foreach lib,$(va_libs),\ $(foreach lib,$(va_libs),\
$(eval $(call define-redroid-prebuilt-lib,$(lib),$(lib),,,,$(drv_libs) $(drm_libs)))) $(eval $(call define-redroid-prebuilt-lib,$(lib),$(lib),,,,$(drv_libs) $(drm_libs))))
endif
## LLVM ## LLVM
@@ -181,9 +185,11 @@ include $$(BUILD_PREBUILT)
endef endef
# vaapi # vaapi
ifeq (,$(filter $(PLATFORM_VERSION), 15 16))
bins:=avcenc h264encode hevcencode jpegenc vp8enc vp9enc vainfo bins:=avcenc h264encode hevcencode jpegenc vp8enc vp9enc vainfo
$(foreach i,$(bins),\ $(foreach i,$(bins),\
$(eval $(call define-redroid-prebuilt-bin,$(i),$(va_libs)))) $(eval $(call define-redroid-prebuilt-bin,$(i),$(va_libs))))
endif
$(eval $(call define-redroid-prebuilt-bin,uinputd,$(evdev_libs),uinputd/uinputd.rc)) $(eval $(call define-redroid-prebuilt-bin,uinputd,$(evdev_libs),uinputd/uinputd.rc))