diff options
| author | Kenneth Graunke <[email protected]> | 2016-03-01 16:26:09 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-03-01 17:11:29 -0800 |
| commit | 89e421369c54a8edc4930352e062f03b5c66b886 (patch) | |
| tree | 54ec1f2d99454da125abe0ed49164b1c47fd9d36 /src/gallium/drivers/vc4 | |
| parent | e941fd84707d4ed04a683f8862d184956a60f9ad (diff) | |
| parent | 1be953797ea4ae31193ab40bd35133eef38ae0ce (diff) | |
Merge remote-tracking branch 'origin/master' into vulkan
Diffstat (limited to 'src/gallium/drivers/vc4')
| -rw-r--r-- | src/gallium/drivers/vc4/Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk index f42a152aa8c..2efb4722636 100644 --- a/src/gallium/drivers/vc4/Android.mk +++ b/src/gallium/drivers/vc4/Android.mk @@ -28,9 +28,11 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(C_SOURCES) +LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H) + LOCAL_SHARED_LIBRARIES := libdrm -# We need libmesa_glsl to get NIR's generated include directories. -LOCAL_STATIC_LIBRARIES := libmesa_glsl +# We need libmesa_nir to get NIR's generated include directories. +LOCAL_STATIC_LIBRARIES := libmesa_nir LOCAL_MODULE := libmesa_pipe_vc4 include $(GALLIUM_COMMON_MK) |