On 27 April 2017 at 20:43, Rob Herring <r...@kernel.org> wrote: > Add exported include paths rather than explicitly adding the includes > in each user of the common AMD libs. > > Signed-off-by: Rob Herring <r...@kernel.org> > --- > src/amd/Android.addrlib.mk | 6 ++++++ > src/amd/Android.common.mk | 3 +++ > src/gallium/drivers/r600/Android.mk | 3 --- > src/gallium/winsys/amdgpu/drm/Android.mk | 7 +------ > 4 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/src/amd/Android.addrlib.mk b/src/amd/Android.addrlib.mk > index 540de5554bdd..a29f7c16d179 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 faace71e952f..6d2450374a13 100644 > --- a/src/amd/Android.common.mk > +++ b/src/amd/Android.common.mk > @@ -57,6 +57,9 @@ LOCAL_C_INCLUDES := \ > external/libcxx/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 7be3614c03eb..cc89d8f6aeda 100644 > --- a/src/gallium/drivers/r600/Android.mk > +++ b/src/gallium/drivers/r600/Android.mk > @@ -30,9 +30,6 @@ include $(CLEAR_VARS) > > LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES) > > -LOCAL_C_INCLUDES := $(MESA_TOP)/src/amd/common \ > - external/libcxx/include > - The libcxx removal seems unrelated. It's trivial so let's just add a small comment in the commit summary and leave it as-is.
-Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
