diff options
| author | Rob Herring <[email protected]> | 2017-05-03 14:35:20 -0500 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-11 13:52:21 +0100 |
| commit | 3f097396a1642bb7033002d0bdd37e194afce06a (patch) | |
| tree | 8a4bd04f538b8622325f18b9b26053256a44da63 /src/gallium/winsys | |
| parent | 2a2dabe1c330fea311505b453de58ddcd5488fcc (diff) | |
Android: push driver build details to driver makefiles
src/gallium/targets/dri/Android.mk contains lots of conditional for
individual drivers. Let's move these details into the individual driver
makefiles.
In the process, align the make driver conditionals with automake
(i.e. HAVE_GALLIUM_*).
Signed-off-by: Rob Herring <[email protected]>
[Emil Velikov: add the radeon winsys for radeonsi]
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/winsys')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/Android.mk | 5 | ||||
| -rw-r--r-- | src/gallium/winsys/i915/drm/Android.mk | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk b/src/gallium/winsys/amdgpu/drm/Android.mk index 1b9439c4f88..75a4a15809f 100644 --- a/src/gallium/winsys/amdgpu/drm/Android.mk +++ b/src/gallium/winsys/amdgpu/drm/Android.mk @@ -41,3 +41,8 @@ LOCAL_MODULE := libmesa_winsys_amdgpu include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) + +ifneq ($(HAVE_GALLIUM_RADEONSI),) +$(eval GALLIUM_LIBS += $(LOCAL_MODULE) $(LOCAL_STATIC_LIBRARIES)) +$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) +endif diff --git a/src/gallium/winsys/i915/drm/Android.mk b/src/gallium/winsys/i915/drm/Android.mk index b38bd8dca06..bab3e85c5dd 100644 --- a/src/gallium/winsys/i915/drm/Android.mk +++ b/src/gallium/winsys/i915/drm/Android.mk @@ -35,3 +35,7 @@ LOCAL_MODULE := libmesa_winsys_i915 include $(GALLIUM_COMMON_MK) include $(BUILD_STATIC_LIBRARY) + +ifneq ($(HAVE_GALLIUM_I915),) +$(eval GALLIUM_SHARED_LIBS += $(LOCAL_SHARED_LIBRARIES)) +endif |