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/targets/dri/Android.mk | |
| parent | e941fd84707d4ed04a683f8862d184956a60f9ad (diff) | |
| parent | 1be953797ea4ae31193ab40bd35133eef38ae0ce (diff) | |
Merge remote-tracking branch 'origin/master' into vulkan
Diffstat (limited to 'src/gallium/targets/dri/Android.mk')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 2a7738e6979..7da0e8aabbb 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -28,9 +28,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := gallium_dri ifeq ($(MESA_LOLLIPOP_BUILD),true) -LOCAL_MODULE_RELATIVE_PATH := $(notdir $(MESA_DRI_MODULE_PATH)) +LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) else LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH) +LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) endif LOCAL_SRC_FILES := target.c @@ -109,6 +110,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \ libmesa_st_dri \ libmesa_st_mesa \ libmesa_glsl \ + libmesa_compiler \ + libmesa_nir \ libmesa_dri_common \ libmesa_megadriver_stub \ libmesa_gallium \ |