Mesa (master): Android: amd: use exported include dirs instead of explicit includes

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 108250197996d76fbfe4ab437a696862d9a1971d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=108250197996d76fbfe4ab437a696862d9a1971d

Author: Rob Herring <robh at kernel.org>
Date:   Wed May  3 14:35:16 2017 -0500

Android: amd: use exported include dirs instead of explicit includes

Add exported include paths rather than explicitly adding the includes
in each user of the common AMD libs.

Signed-off-by: Rob Herring <robh at kernel.org>
Reviewed-by: Chih-Wei Huang <cwhuang at linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/amd/Android.addrlib.mk               | 6 ++++++
 src/amd/Android.common.mk                | 3 +++
 src/gallium/drivers/r600/Android.mk      | 2 --
 src/gallium/winsys/amdgpu/drm/Android.mk | 7 +------
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/amd/Android.addrlib.mk b/src/amd/Android.addrlib.mk
index 540de5554b..a29f7c16d1 100644
--- a/src/amd/Android.addrlib.mk
+++ b/src/amd/Android.addrlib.mk
@@ -42,5 +42,11 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/amd/addrlib/gfx9/chip \
 	$(MESA_TOP)/src/amd/addrlib/r800/chip
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+	$(LOCAL_PATH) \
+	$(LOCAL_PATH)/addrlib/core \
+	$(LOCAL_PATH)/addrlib/inc/chip/r800 \
+	$(LOCAL_PATH)/addrlib/r800/chip
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/amd/Android.common.mk b/src/amd/Android.common.mk
index aa0b1742b6..a770aca650 100644
--- a/src/amd/Android.common.mk
+++ b/src/amd/Android.common.mk
@@ -58,6 +58,9 @@ LOCAL_C_INCLUDES := \
 	external/llvm/device/include \
 	$(ELF_INCLUDES)
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+	$(LOCAL_PATH)/common
+
 LOCAL_STATIC_LIBRARIES := libLLVMCore
 
 include $(MESA_COMMON_MK)
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index a2fa623608..cc89d8f6ae 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
 
-LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common
-
 LOCAL_STATIC_LIBRARIES := libmesa_amd_common
 LOCAL_SHARED_LIBRARIES := libdrm_radeon
 LOCAL_MODULE := libmesa_pipe_r600
diff --git a/src/gallium/winsys/amdgpu/drm/Android.mk b/src/gallium/winsys/amdgpu/drm/Android.mk
index 9030a83880..1b9439c4f8 100644
--- a/src/gallium/winsys/amdgpu/drm/Android.mk
+++ b/src/gallium/winsys/amdgpu/drm/Android.mk
@@ -34,12 +34,7 @@ LOCAL_CFLAGS := \
 	$(AMDGPU_CFLAGS) \
 	-DBRAHMA_BUILD=1
 
-LOCAL_C_INCLUDES := \
-	$(MESA_TOP)/src \
-	$(MESA_TOP)/src/amd \
-	$(MESA_TOP)/src/amd/addrlib/core \
-	$(MESA_TOP)/src/amd/addrlib/inc/chip/r800 \
-	$(MESA_TOP)/src/amd/addrlib/r800/chip
+LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib
 
 LOCAL_SHARED_LIBRARIES := libdrm_amdgpu
 LOCAL_MODULE := libmesa_winsys_amdgpu