diff options
| author | Rob Herring <[email protected]> | 2016-02-24 12:56:28 -0600 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-02-29 11:15:25 +0000 |
| commit | 43834d463da152f299b63a8fccc6895e977c638b (patch) | |
| tree | cde1cc879cd102e118ef9493c591aa5d1b0b324e /Android.mk | |
| parent | bb83ce066464506bee84761cbd20302fd099bf5f (diff) | |
Android: clean-up and fix DRI module path handling
MESA_DRI_MODULE_PATH is only getting set for classic DRI drivers and may or
may not be set correctly for gallium_dri.so depending on the makefile
include ordering. For Android 6 and earlier it is fine, but with build
system changes in AOSP master, it is not.
Move the path variables to a single place at the top level and introduce
MESA_DRI_MODULE_REL_PATH for Android 5 and later which require relative
paths. With this, there is a single variable to change.
Cc: "11.1 11.2" <[email protected]>
Signed-off-by: Rob Herring <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
(cherry picked from commit 8949edf01863ade9c87a02e1256bba083f14317a)
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 2c56b73dffc..67d894f2af1 100644 --- 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 |