From: Emil Velikov Date: Fri, 27 Mar 2015 11:40:42 +0000 (+0000) Subject: android: use LOCAL_SHARED_LIBRARIES over TARGET_OUT_HEADERS X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=86919352e3da1c80409fdcb67c36f29a9687b7a9;p=mesa.git android: use LOCAL_SHARED_LIBRARIES over TARGET_OUT_HEADERS ... to manage the LIBDRM*_CFLAGS. The former is the recommended approach by the Android build system developers while the latter has been depreciated for quite some time. Cc: "10.4 10.5" Signed-off-by: Emil Velikov --- diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk index f91a90336bf..d5ac8ee34cb 100644 --- a/src/egl/drivers/dri2/Android.mk +++ b/src/egl/drivers/dri2/Android.mk @@ -40,12 +40,12 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/egl/main \ $(MESA_TOP)/src/loader \ - $(TARGET_OUT_HEADERS)/libdrm \ $(DRM_GRALLOC_TOP) LOCAL_STATIC_LIBRARIES := \ libmesa_loader +LOCAL_SHARED_LIBRARIES := libdrm LOCAL_MODULE := libmesa_egl_dri2 include $(MESA_COMMON_MK) diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk index 6cab31fd714..a6712b2c115 100644 --- a/src/gallium/drivers/freedreno/Android.mk +++ b/src/gallium/drivers/freedreno/Android.mk @@ -34,10 +34,9 @@ LOCAL_CFLAGS := \ -Wno-packed-bitfield-compat LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/ir3 \ - $(TARGET_OUT_HEADERS)/libdrm \ - $(TARGET_OUT_HEADERS)/freedreno + $(LOCAL_PATH)/ir3 +LOCAL_SHARED_LIBRARIES := libdrm libdrm_freedreno LOCAL_MODULE := libmesa_pipe_freedreno include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk index 3f6ec5b6a07..420c8e5734c 100644 --- a/src/gallium/drivers/nouveau/Android.mk +++ b/src/gallium/drivers/nouveau/Android.mk @@ -36,9 +36,7 @@ LOCAL_SRC_FILES := \ $(NVC0_CODEGEN_SOURCES) \ $(NVC0_C_SOURCES) -LOCAL_C_INCLUDES := \ - $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_nouveau LOCAL_MODULE := libmesa_pipe_nouveau include external/stlport/libstlport.mk diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk index d3ef76d67a6..7ff4f86bf0d 100644 --- a/src/gallium/drivers/r300/Android.mk +++ b/src/gallium/drivers/r300/Android.mk @@ -33,9 +33,10 @@ LOCAL_SRC_FILES := $(C_SOURCES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/glsl \ - $(MESA_TOP)/src/mesa \ - $(TARGET_OUT_HEADERS)/libdrm + $(MESA_TOP)/src/mesa + +LOCAL_SHARED_LIBRARIES := libdrm libdrm_radeon LOCAL_MODULE := libmesa_pipe_r300 include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk index 3b12dd66db7..e9357597a9b 100644 --- a/src/gallium/drivers/r600/Android.mk +++ b/src/gallium/drivers/r600/Android.mk @@ -30,8 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES) -LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_radeon LOCAL_MODULE := libmesa_pipe_r600 include external/stlport/libstlport.mk diff --git a/src/gallium/drivers/radeon/Android.mk b/src/gallium/drivers/radeon/Android.mk index d562f4c3815..d61579280ea 100644 --- a/src/gallium/drivers/radeon/Android.mk +++ b/src/gallium/drivers/radeon/Android.mk @@ -30,8 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_radeon LOCAL_MODULE := libmesa_pipe_radeon include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/drivers/radeonsi/Android.mk b/src/gallium/drivers/radeonsi/Android.mk index 22c0fdcd84f..57f3bef36b0 100644 --- a/src/gallium/drivers/radeonsi/Android.mk +++ b/src/gallium/drivers/radeonsi/Android.mk @@ -30,8 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_radeon LOCAL_MODULE := libmesa_pipe_radeonsi include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/winsys/freedreno/drm/Android.mk b/src/gallium/winsys/freedreno/drm/Android.mk index 7bd31d92419..b45d3d4b68e 100644 --- a/src/gallium/winsys/freedreno/drm/Android.mk +++ b/src/gallium/winsys/freedreno/drm/Android.mk @@ -27,10 +27,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := \ - $(TARGET_OUT_HEADERS)/libdrm \ - $(TARGET_OUT_HEADERS)/freedreno - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_freedreno LOCAL_MODULE := libmesa_winsys_freedreno include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/winsys/i915/drm/Android.mk b/src/gallium/winsys/i915/drm/Android.mk index ffcf4d51dfe..5c9107b6601 100644 --- a/src/gallium/winsys/i915/drm/Android.mk +++ b/src/gallium/winsys/i915/drm/Android.mk @@ -30,8 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_intel LOCAL_MODULE := libmesa_winsys_i915 include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/winsys/intel/drm/Android.mk b/src/gallium/winsys/intel/drm/Android.mk index a39188329e2..463d315c813 100644 --- a/src/gallium/winsys/intel/drm/Android.mk +++ b/src/gallium/winsys/intel/drm/Android.mk @@ -29,8 +29,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_intel LOCAL_MODULE := libmesa_winsys_intel include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/winsys/nouveau/drm/Android.mk b/src/gallium/winsys/nouveau/drm/Android.mk index 142cc6bc387..2841080fa88 100644 --- a/src/gallium/winsys/nouveau/drm/Android.mk +++ b/src/gallium/winsys/nouveau/drm/Android.mk @@ -30,8 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_nouveau LOCAL_MODULE := libmesa_winsys_nouveau include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/winsys/radeon/drm/Android.mk b/src/gallium/winsys/radeon/drm/Android.mk index 3165ba479e8..eacb35f5441 100644 --- a/src/gallium/winsys/radeon/drm/Android.mk +++ b/src/gallium/winsys/radeon/drm/Android.mk @@ -30,8 +30,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(C_SOURCES) -LOCAL_C_INCLUDES := $(TARGET_OUT_HEADERS)/libdrm - +LOCAL_SHARED_LIBRARIES := libdrm libdrm_radeon LOCAL_MODULE := libmesa_winsys_radeon include $(GALLIUM_COMMON_MK) diff --git a/src/gallium/winsys/svga/drm/Android.mk b/src/gallium/winsys/svga/drm/Android.mk index a26138ec1ee..f57225e02d9 100644 --- a/src/gallium/winsys/svga/drm/Android.mk +++ b/src/gallium/winsys/svga/drm/Android.mk @@ -34,9 +34,9 @@ LOCAL_CFLAGS := -D_FILE_OFFSET_BITS=64 LOCAL_C_INCLUDES := \ $(GALLIUM_TOP)/drivers/svga \ - $(GALLIUM_TOP)/drivers/svga/include \ - $(TARGET_OUT_HEADERS)/libdrm + $(GALLIUM_TOP)/drivers/svga/include +LOCAL_SHARED_LIBRARIES := libdrm LOCAL_MODULE := libmesa_winsys_svga include $(GALLIUM_COMMON_MK) diff --git a/src/loader/Android.mk b/src/loader/Android.mk index 8daeedf5dad..8e215de3cda 100644 --- a/src/loader/Android.mk +++ b/src/loader/Android.mk @@ -37,7 +37,7 @@ LOCAL_SRC_FILES := \ ifeq ($(MESA_GPU_DRIVERS),swrast) LOCAL_CFLAGS += -D__NOT_HAVE_DRM_H else -LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm +LOCAL_SHARED_LIBRARIES := libdrm endif LOCAL_MODULE := libmesa_loader diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index 935722c5397..d1c836be370 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -38,7 +38,6 @@ MESA_DRI_C_INCLUDES := \ $(MESA_TOP)/src \ $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \ $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ - $(TARGET_OUT_HEADERS)/libdrm \ external/expat/lib MESA_DRI_WHOLE_STATIC_LIBRARIES := \