Hi Wu Zhen, On 6 January 2017 at 17:35, Wu Zhen <wuz...@jidemail.com> wrote: > From: WuZhen <wuz...@jidemail.com> > > this commit fixes mesa building on lollipop, however, > llvm on lollipop is too old to build amdgpu > On top of the comment by Mauro, please make sure patches are split logically. For example:
> based on initial work by Mauro Rossi <issor.or...@gmail.com> > > Change-Id: I98d646f9e1c61fe2754479382885718386a8bbb7 > Reviewed-by: Mauro Rossi <issor.or...@gmail.com> > Reviewed-by: Chih-Wei Huang <cwhu...@linux.org.tw> > --- > Android.common.mk | 2 +- > Android.mk | 5 ++++- > src/gbm/Android.mk | 1 + > src/mesa/Android.libmesa_st_mesa.mk | 1 + > 4 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/Android.common.mk b/Android.common.mk > index 9f64c220f8..7ab3942ee2 100644 > --- a/Android.common.mk > +++ b/Android.common.mk > @@ -91,7 +91,7 @@ endif > endif > > LOCAL_CPPFLAGS += \ > - $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \ > + $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-std=c++11) \ This alongside the libcxx.mk hunk is to be something like "android: correctly manage/select C++ builds on $Android_ver" > --- a/Android.mk > +++ b/Android.mk > @@ -95,10 +95,13 @@ SUBDIRS := \ > src/mesa \ > src/util \ > src/egl \ > - src/amd \ > src/intel \ > src/mesa/drivers/dri > > +ifneq ($(filter r300g r600g radeonsi, $(MESA_GPU_DRIVERS)),) > +SUBDIRS += src/amd > +endif > + This hunk is "android: dive into src/amd only as needed" > --- a/src/gbm/Android.mk > +++ b/src/gbm/Android.mk > @@ -33,6 +33,7 @@ LOCAL_C_INCLUDES := \ > $(LOCAL_PATH)/main > > LOCAL_STATIC_LIBRARIES := libmesa_loader > +LOCAL_SHARED_LIBRARIES := libdl And this one "android: gbm: add missing link against libdl" Thanks Emil _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
