diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/dri/Android.mk b/src/gallium/state_trackers/dri/Android.mk index 4bdd136..bec13d5 100644 --- a/src/gallium/state_trackers/dri/Android.mk +++ b/src/gallium/state_trackers/dri/Android.mk @@ -42,11 +42,10 @@ LOCAL_STATIC_LIBRARIES := \ ifneq ($(filter swrast,$(MESA_GPU_DRIVERS)),) LOCAL_SRC_FILES += $(drisw_SOURCES) +LOCAL_SHARED_LIBRARIES := libdrm endif -ifneq ($(filter-out swrast,$(MESA_GPU_DRIVERS)),) LOCAL_SRC_FILES += $(dri2_SOURCES) -endif LOCAL_MODULE := libmesa_st_dri diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 18aefe3..f4b5fef 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -125,7 +125,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ ifeq ($(MESA_ENABLE_LLVM),true) -LOCAL_STATIC_LIBRARIES := libelf libz +LOCAL_STATIC_LIBRARIES := \ + libLLVMExecutionEngine \ + libelf libz LOCAL_LDLIBS += $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-lgcc) endif |