Skip to content

Commit

Permalink
vc4: Fix Android build
Browse files Browse the repository at this point in the history 
Also fixes build with both v3d and vc4 selected.

Signed-off-by: Roman Stratiienko <roman.stratiienko@nure.ua>
  • Loading branch information
Roman Stratiienko committed Jun 18, 2020
1 parent dd95149 commit e2b7543
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion src/gallium/drivers/v3d/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_WHOLE_STATIC_LIBRARIES := \
libbroadcom-v33 \
libbroadcom-v41 \
libmesa_broadcom_common \
libmesa_broadcom_compiler \
libmesa_broadcom_cle \
libmesa_broadcom_genxml \
Expand Down
2 changes: 1 addition & 1 deletion src/gallium/drivers/vc4/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ LOCAL_C_INCLUDES := \

# We need libmesa_nir to get NIR's generated include directories.
LOCAL_STATIC_LIBRARIES := \
libmesa_broadcom_cle \
libmesa_nir

LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_broadcom_cle \
libmesa_broadcom_genxml

LOCAL_MODULE := libmesa_pipe_vc4
Expand Down
1 change: 1 addition & 0 deletions src/gallium/targets/dri/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ LOCAL_STATIC_LIBRARIES += \
libpanfrost_midgard \
libpanfrost_shared \
libpanfrost_util \
libmesa_broadcom_common \

ifeq ($(USE_LIBBACKTRACE),true)
LOCAL_SHARED_LIBRARIES += libbacktrace
Expand Down

1 comment on commit e2b7543

@KonstaT
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still facing build issues when building vc4 only.

With this patch (lineage-rpi/android_external_mesa3d@472ded3) both Pi 3 build (BOARD_GPU_DRIVERS := vc4) and Pi 4 (BOARD_GPU_DRIVERS := v3d kmsro) compiles without errors.

Please sign in to comment.