aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorMauro Rossi <[email protected]>2016-06-02 21:15:35 +0200
committerEmil Velikov <[email protected]>2016-06-02 22:31:44 +0100
commit278c2212ac137c19438a84072c8d3150b5a5b4f6 (patch)
tree9f14b2b894eb3cb34824b086c755d5809679fde3 /src/mesa/drivers/dri
parent4143245c23c25a8b81c4ab6ca3d9211593edf542 (diff)
isl: add support for Android libmesa_isl static library
isl library is needed to build i965, libmesa_isl static library is added to fix related Android building errors. Any attempt to build libmesa_genxml as phony package module failed to deliver gen{7,75,8,9}_pack.h generated headers, needed for libmesa_isl_gen{7,75,8,9} Due to constraints in Android Build System, libmesa_genxml is built as static, at least one source is needed, so dummy.c is autogenerated for this scope, libmesa_genxml dependency is declared using LOCAL_WHOLE_STATIC_LIBRARIES, to avoid building errors due to missing genxml/gen{7,75,8,9}_pack.h headers. Cc: <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 9fd3a304ad4..e8a379f6b48 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -52,7 +52,8 @@ LOCAL_SRC_FILES := \
$(i965_FILES)
LOCAL_WHOLE_STATIC_LIBRARIES := \
- $(MESA_DRI_WHOLE_STATIC_LIBRARIES)
+ $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \
+ libmesa_isl
LOCAL_SHARED_LIBRARIES := \
$(MESA_DRI_SHARED_LIBRARIES) \