summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorRob Herring <[email protected]>2017-05-03 14:35:16 -0500
committerEmil Velikov <[email protected]>2017-05-11 13:52:21 +0100
commit108250197996d76fbfe4ab437a696862d9a1971d (patch)
tree78c1b806439251dcd7b2a45021ee8e2a150b1e7d /src/gallium
parent4eec1cfa8ef250609699c8fc658e8fe58d6fab61 (diff)
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 <[email protected]> Reviewed-by: Chih-Wei Huang <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r600/Android.mk2
-rw-r--r--src/gallium/winsys/amdgpu/drm/Android.mk7
2 files changed, 1 insertions, 8 deletions
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index a2fa6236088..cc89d8f6aed 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 9030a83880d..1b9439c4f88 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