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@kernel.org> Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
4eec1cfa8e
commit
1082501979
|
@ -42,5 +42,11 @@ LOCAL_C_INCLUDES := \
|
||||||
$(MESA_TOP)/src/amd/addrlib/gfx9/chip \
|
$(MESA_TOP)/src/amd/addrlib/gfx9/chip \
|
||||||
$(MESA_TOP)/src/amd/addrlib/r800/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 $(MESA_COMMON_MK)
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|
|
@ -58,6 +58,9 @@ LOCAL_C_INCLUDES := \
|
||||||
external/llvm/device/include \
|
external/llvm/device/include \
|
||||||
$(ELF_INCLUDES)
|
$(ELF_INCLUDES)
|
||||||
|
|
||||||
|
LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
||||||
|
$(LOCAL_PATH)/common
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := libLLVMCore
|
LOCAL_STATIC_LIBRARIES := libLLVMCore
|
||||||
|
|
||||||
include $(MESA_COMMON_MK)
|
include $(MESA_COMMON_MK)
|
||||||
|
|
|
@ -30,8 +30,6 @@ include $(CLEAR_VARS)
|
||||||
|
|
||||||
LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
|
LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common
|
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := libmesa_amd_common
|
LOCAL_STATIC_LIBRARIES := libmesa_amd_common
|
||||||
LOCAL_SHARED_LIBRARIES := libdrm_radeon
|
LOCAL_SHARED_LIBRARIES := libdrm_radeon
|
||||||
LOCAL_MODULE := libmesa_pipe_r600
|
LOCAL_MODULE := libmesa_pipe_r600
|
||||||
|
|
|
@ -34,12 +34,7 @@ LOCAL_CFLAGS := \
|
||||||
$(AMDGPU_CFLAGS) \
|
$(AMDGPU_CFLAGS) \
|
||||||
-DBRAHMA_BUILD=1
|
-DBRAHMA_BUILD=1
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := \
|
LOCAL_STATIC_LIBRARIES := libmesa_amdgpu_addrlib
|
||||||
$(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_SHARED_LIBRARIES := libdrm_amdgpu
|
LOCAL_SHARED_LIBRARIES := libdrm_amdgpu
|
||||||
LOCAL_MODULE := libmesa_winsys_amdgpu
|
LOCAL_MODULE := libmesa_winsys_amdgpu
|
||||||
|
|
Loading…
Reference in New Issue