Android: clean-up and fix DRI module path handling

[mesa.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 908078a02cece1e75b0a3d4194e1c091c0b71891..67d894f2af12fb199910f55a6e4be82099bb3ee5 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -42,6 +42,10 @@ $(call local-intermediates-dir)
 endef
 endif
 
+MESA_DRI_MODULE_REL_PATH := dri
+MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH)
+MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH)
+
 MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk
 MESA_PYTHON2 := python
 
@@ -87,7 +91,7 @@ SUBDIRS := \
        src/loader \
        src/mapi \
        src/compiler \
-       src/glsl \
+       src/compiler/glsl \
        src/mesa \
        src/util \
        src/egl \